diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 396a6c385..f73d769a8 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -304,8 +304,7 @@
   <string name="UpS_changelog_title">Was ist neu bei Astrid?</string>
   <string name="UpS_updates_title">Astrid Neuigkeiten</string>
   <string name="UpS_no_activity_log_in">Wenn du dich einloggst, kann du den \nFortschritt deiner eigenen also auch \ngemeinsamer Aufgabenlisten einsehen.</string>
-  <string name="EPr_title">Astrid: Einstellungen</string>
-  <string name="EPr_title_short">Einstellungen</string>
+  <string name="EPr_title">Einstellungen</string>
   <string name="EPr_share_astrid">Erzähl Anderen von Astrid</string>
   <string name="EPr_share_astrid_summary">Erzähle von Astrid auf deinem bevorzugten sozialen Netzwerk</string>
   <string name="EPr_deactivated">deaktiviert</string>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index e46e71559..12edb3507 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -338,8 +338,7 @@
   <string name="UpS_changelog_title">¿Que hay de nuevo en Astrid?</string>
   <string name="UpS_updates_title">Últimas Noticias de Astrid</string>
   <string name="UpS_no_activity_log_in">Ingresa para ver un registro de\ntu progreso así como la\nactividad en listas compartidas.</string>
-  <string name="EPr_title">Astrid: Preferencias</string>
-  <string name="EPr_title_short">Configuración</string>
+  <string name="EPr_title">Configuración</string>
   <string name="EPr_share_astrid">Háblales a otros sobre Astrid</string>
   <string name="EPr_share_astrid_summary">Comparte algo de Astrid en tu red social favorita</string>
   <string name="EPr_deactivated">desactivada</string>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 7643f8d6b..91623eb8c 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -313,8 +313,7 @@
   <string name="UpS_changelog_title">Quoi de neuf dans Astrid ?</string>
   <string name="UpS_updates_title">Dernières nouvelles d\'Astrid</string>
   <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>
-  <string name="EPr_title">Astrid : Paramètres</string>
-  <string name="EPr_title_short">Préférences</string>
+  <string name="EPr_title">Paramètres</string>
   <string name="EPr_share_astrid">Parlez d\'Astrid</string>
   <string name="EPr_share_astrid_summary">Partagez Astrid sur vos réseaux sociaux préférés</string>
   <string name="EPr_deactivated">désactivé</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 0123d49e8..65aad2559 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -293,8 +293,7 @@
   </string-array>
   <string name="UpS_changelog_title">Novità in Astrid?</string>
   <string name="UpS_updates_title">Ultime Novità di Astrid</string>
-  <string name="EPr_title">Astrid: Preferenze</string>
-  <string name="EPr_title_short">Impostazioni</string>
+  <string name="EPr_title">Impostazioni</string>
   <string name="EPr_share_astrid">Dì agli altri di Astrid</string>
   <string name="EPr_share_astrid_summary">Condividi Astrid nel tuo social network preferito</string>
   <string name="EPr_deactivated">disattivato</string>
diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml
index c1fb0aebe..b93aff029 100644
--- a/astrid/res/values-iw/strings.xml
+++ b/astrid/res/values-iw/strings.xml
@@ -295,8 +295,7 @@
   <string name="UpS_changelog_title">מה חדש ב־Astrid?</string>
   <string name="UpS_updates_title">חדשות Astrid אחרונות</string>
   <string name="UpS_no_activity_log_in">התחבר כדי לראות דו״ח על\n\nהתקדמותך ועל הפעילות\n\nברשימות המשותפות.</string>
-  <string name="EPr_title">הגדרות אסטריד</string>
-  <string name="EPr_title_short">הגדרות</string>
+  <string name="EPr_title">הגדרות</string>
   <string name="EPr_share_astrid">ספר לאחרים על אסטריד</string>
   <string name="EPr_share_astrid_summary">ספר על אסטריד ברשתות חברתיות</string>
   <string name="EPr_deactivated">מופסק</string>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index 8c80a128b..47f412e06 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -338,8 +338,7 @@
   <string name="UpS_changelog_title">Astrid 의 새로운 기능</string>
   <string name="UpS_updates_title">최신 Astrid 뉴스</string>
   <string name="UpS_no_activity_log_in">공유한 목록상의 활동 내역과\n자신의 일정 진행 기록을\n보려면 로그인하세요.</string>
-  <string name="EPr_title">Astrid: 설정</string>
-  <string name="EPr_title_short">설정</string>
+  <string name="EPr_title">설정</string>
   <string name="EPr_share_astrid">다른 사람에게 Astrid 알리기</string>
   <string name="EPr_share_astrid_summary">내가 즐겨찾는 소셜 네트워크에 Astrid를 공유합니다</string>
   <string name="EPr_deactivated">비활성화됨</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index d25828f8b..a442f91a1 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -303,8 +303,7 @@
   <string name="UpS_changelog_title">Nieuw in Astrid</string>
   <string name="UpS_updates_title">Laatste Astrid nieuws</string>
   <string name="UpS_no_activity_log_in">Log in om een geschiedenis\nvan je vooruitgang en activiteiten\nop gedeelde lijsten te bekijken.</string>
-  <string name="EPr_title">Astrid: Instellingen</string>
-  <string name="EPr_title_short">Instellingen</string>
+  <string name="EPr_title">Instellingen</string>
   <string name="EPr_deactivated">uitgeschakeld</string>
   <string name="EPr_appearance_header">Uiterlijk</string>
   <string name="EPr_faq_title">FAQ (Veelgestelde Vragen)</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index f9e19d65f..5f21cd9f2 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -298,8 +298,7 @@
   <string name="UpS_changelog_title">Co nowego w Astrid?</string>
   <string name="UpS_updates_title">Aktualności Astrid</string>
   <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>
-  <string name="EPr_title">Astrid: Właściwości</string>
-  <string name="EPr_title_short">Ustawienia</string>
+  <string name="EPr_title">Ustawienia</string>
   <string name="EPr_share_astrid">Powiedz innym o Astrid</string>
   <string name="EPr_share_astrid_summary">Poinformuj o Astrid poprzez ulubioną sieć społecznościową</string>
   <string name="EPr_deactivated">niekatywny</string>
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index 1622d47fa..cc4bf5d16 100644
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -321,8 +321,7 @@
   <string name="UpS_changelog_title">O que há de novo no Astrid?</string>
   <string name="UpS_updates_title">Ultimas novidades no Astrid</string>
   <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>
-  <string name="EPr_title">Astrid: Configurações</string>
-  <string name="EPr_title_short">Preferências</string>
+  <string name="EPr_title">Configurações</string>
   <string name="EPr_share_astrid">Fale a outros sobre Astrid</string>
   <string name="EPr_share_astrid_summary">Compartilhe sobre Astrid em sua rede social favorita</string>
   <string name="EPr_deactivated">desativado</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 972535b8d..d4a6c7cb7 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -338,8 +338,7 @@
   <string name="UpS_changelog_title">Что нового в Astrid?</string>
   <string name="UpS_updates_title">Последние новости Astrid</string>
   <string name="UpS_no_activity_log_in">Войдите, чтобы увидеть\nсвой прогресс и активность\nв опубликованных списках.</string>
-  <string name="EPr_title">Astrid: Настройки</string>
-  <string name="EPr_title_short">Настройки</string>
+  <string name="EPr_title">Настройки</string>
   <string name="EPr_share_astrid">Расскажи остальным про Astrid</string>
   <string name="EPr_share_astrid_summary">Расскажи про Astrid в любимой социальной сети</string>
   <string name="EPr_deactivated">выключен</string>
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index d26f5d729..e7f1c6914 100644
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -322,8 +322,7 @@
   <string name="UpS_changelog_title">Astrid\'te Yenilikler Neler?</string>
   <string name="UpS_updates_title">En Son Astrid Haberleri</string>
   <string name="UpS_no_activity_log_in">Paylaşılan listelerdeki etkinlik\nilerlemenizin kaydını görmek\niçin oturum açın.</string>
-  <string name="EPr_title">Astrid: Ayarlar</string>
-  <string name="EPr_title_short">Ayarlar</string>
+  <string name="EPr_title">Ayarlar</string>
   <string name="EPr_share_astrid">Diğerlerine Astrid\'ten bahset</string>
   <string name="EPr_share_astrid_summary">Beğendiğiniz sosyal ağınızda Astrid\'ten bahsedin</string>
   <string name="EPr_deactivated">devre dışı</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 8c47aa188..574fc7535 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -302,8 +302,7 @@
   <string name="UpS_changelog_title">清单小助理有哪些最新功能？</string>
   <string name="UpS_updates_title">清单小助理最新消息</string>
   <string name="UpS_no_activity_log_in">登录查看您的活动进展情况 \n以及在各分享列表上的活动。</string>
-  <string name="EPr_title">清单小助理：设置</string>
-  <string name="EPr_title_short">设置</string>
+  <string name="EPr_title">设置</string>
   <string name="EPr_share_astrid">介绍清单小助理给您的朋友</string>
   <string name="EPr_share_astrid_summary">在您喜欢的社交网站上分享清单小助理</string>
   <string name="EPr_deactivated">禁用</string>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index cd065354c..4ce21cd37 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -302,8 +302,7 @@
   <string name="UpS_changelog_title">Astrid 有哪些最新消息?</string>
   <string name="UpS_updates_title">Astrid 最新消息</string>
   <string name="UpS_no_activity_log_in">登錄查看記錄 \n看看您的活動的進展情況 \n以及在各分享列表上的活動。</string>
-  <string name="EPr_title">Astrid: 偏好</string>
-  <string name="EPr_title_short">設置</string>
+  <string name="EPr_title">偏好</string>
   <string name="EPr_share_astrid">介紹Astrid給您的朋友</string>
   <string name="EPr_share_astrid_summary">在您喜歡的社交網站上分享Astrid</string>
   <string name="EPr_deactivated">禁用</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index d0a1b6dbc..41eb6cb9a 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -51,7 +51,7 @@
   <string name="DLG_decline">I Decline</string>
 
   <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid Terms Of Use</string>
+  <string name="DLG_eula_title">Terms Of Use</string>
 
   <!-- Progress Dialog generic text -->
   <string name="DLG_please_wait">Please Wait</string>
@@ -151,7 +151,7 @@
   <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">Astrid reminders are disabled! You will not receive any reminders</string>
+  <string name="TLA_notification_disabled">Reminders are disabled! You will not receive any reminders</string>
   
   <string-array name="TLA_filters">
       <item>Active</item>
@@ -229,37 +229,37 @@
   <string name="SSD_hidden_title">Hidden Tasks</string>
   
   <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Show Completed Tasks</string>
+  <string name="SSD_completed">Show completed tasks</string>
   
   <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Show Hidden Tasks</string>
+  <string name="SSD_hidden">Show hidden tasks</string>
   
   <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Show Deleted Tasks</string>
+  <string name="SSD_deleted">Show deleted tasks</string>
   
   <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Drag &amp; Drop with Subtasks</string>
+  <string name="SSD_sort_drag">Drag &amp; drop with subtasks</string>
   
   <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid Smart Sort</string>
+  <string name="SSD_sort_auto">Smart sort</string>
   
   <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">By Title</string>
+  <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>
+  <string name="SSD_sort_due">By due date</string>
   
   <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By Importance</string>
+  <string name="SSD_sort_importance">By importance</string>
   
   <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">By Last Modified</string>
+  <string name="SSD_sort_modified">By last modified</string>
   
   <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Reverse Sort</string>
+  <string name="SSD_sort_reverse">Reverse sort</string>
   
   <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Just Once</string>
+  <string name="SSD_save_temp">Just once</string>
   
   <!-- slide 23i: Sort Button: sort permanently -->
   <string name="SSD_save_always">Always</string>
@@ -267,7 +267,7 @@
   <!-- =============================================== FilterListActivity == -->
   
   <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Astrid List or Filter</string>
+  <string name="FSA_label">List or Filter</string>
 
   <!-- Filter List Activity Title -->    
   
@@ -610,7 +610,7 @@
   <!-- ==================================================== UpdateService == -->
   
   <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">What\'s New In Astrid?</string>
+  <string name="UpS_changelog_title">What\'s new?</string>
   
   <!-- Updates Window Title -->
   <string name="UpS_updates_title">Latest Astrid News</string>
@@ -621,9 +621,7 @@
   <!-- ================================================== EditPreferences == -->
     
   <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Settings</string>
-
-  <string name="EPr_title_short">Settings</string>
+  <string name="EPr_title">Settings</string>
   
   <string name="EPr_share_astrid">Tell others about Astrid</string>
 
@@ -861,8 +859,8 @@
   <!-- Add-on Activity - when list is empty -->
   <string name="AOA_no_addons">Empty List!</string>
   
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Support Astrid and get more productive with the Astrid Power Pack. 4x2 and 4x4 widgets and voice integration. Power up today!</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>
   
diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index 1d60e3cbb..391202780 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -48,7 +48,7 @@
     <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 Astrid 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>
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index d05d7f520..1a0906c96 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -109,9 +109,9 @@
   <!-- 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">Astrid reminders are enabled (this is normal)</string>
+  <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">Astrid reminders will never appear on your phone</string>  
+  <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>
diff --git a/astrid/res/values/strings-subtasks.xml b/astrid/res/values/strings-subtasks.xml
index 3944bb517..b59d9376a 100644
--- a/astrid/res/values/strings-subtasks.xml
+++ b/astrid/res/values/strings-subtasks.xml
@@ -7,7 +7,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     
   <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Sort and Indent in Astrid</string>
+  <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>
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index d15b36a68..a383d47f4 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -22,7 +22,7 @@
         android:key="@string/EPr_share_astrid"
         android:summary="@string/EPr_share_astrid_summary"/>
     
-    <PreferenceCategory android:title="@string/EPr_title_short"/>
+    <PreferenceCategory android:title="@string/EPr_title"/>
     
     <PreferenceScreen
         android:title="@string/EPr_appearance_header"