diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 0248776a4..23cc46b8b 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Connect with Facebook</string>
   <string name="actfm_ALA_gg_login">Connecta amb Google</string>
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
-  <string name="actfm_ALA_pw_link">Inicia sessió aquí</string>
-  <string name="actfm_ALA_pw_new">Voleu crear un nou compte?</string>
-  <string name="actfm_ALA_pw_returning">Ja teniu un compte?</string>
-  <string name="actfm_ALA_name_label">Nom</string>
   <string name="actfm_ALA_firstname_label">Nom</string>
   <string name="actfm_ALA_lastname_label">Cognoms</string>
   <string name="actfm_ALA_email_label">Correu electrònic</string>
-  <string name="actfm_ALA_username_email_label">Nom d\'usuari / Correu electrònic</string>
   <string name="actfm_ALA_password_label">Contrasenya</string>
   <string name="actfm_ALA_signup_title">Crea un nou compte</string>
   <string name="actfm_ALA_login_title">Login to Astrid.com</string>
@@ -75,8 +69,6 @@
   <string name="actfm_https_title">Usa HTTPS</string>
   <string name="actfm_https_enabled">HTTPS activat (més lent)</string>
   <string name="actfm_https_disabled">HTTPS desactivat (més ràpid)</string>
-  <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">New comments received / click for more details</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarmes</string>
   <string name="alarm_ACS_button">Afegir una Alarma</string>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index cc0102c46..7a2ab0c57 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -56,15 +56,9 @@
   <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_pw_login">Nepoužíváte Google ani Facebook?</string>
-  <string name="actfm_ALA_pw_link">Přihlašte se zde</string>
-  <string name="actfm_ALA_pw_new">Vytvořit nový účet?</string>
-  <string name="actfm_ALA_pw_returning">Již máte účet?</string>
-  <string name="actfm_ALA_name_label">Jméno</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_username_email_label">Uživ. jméno / Email</string>
   <string name="actfm_ALA_password_label">Heslo</string>
   <string name="actfm_ALA_signup_title">Vytvořit nový účet</string>
   <string name="actfm_ALA_login_title">Přihlásit se do Astrid.com</string>
@@ -75,8 +69,6 @@
   <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_notification_title">Astrid.com Synchronizace</string>
-  <string name="actfm_notification_comments">Přidány nové komenty / klikněte zde pro více detailů</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="alarm_ACS_label">Alarmy</string>
   <string name="alarm_ACS_button">Přidat alarm</string>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index 38883f821..bc2150cd5 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Connect with Facebook</string>
   <string name="actfm_ALA_gg_login">Connect with Google</string>
-  <string name="actfm_ALA_pw_login">Bruger du hverken Google eller Facebook?</string>
-  <string name="actfm_ALA_pw_link">Login her</string>
-  <string name="actfm_ALA_pw_new">Opret ny brugerkonto?</string>
-  <string name="actfm_ALA_pw_returning">Har du allerede en brugerkonto?</string>
-  <string name="actfm_ALA_name_label">Navn</string>
   <string name="actfm_ALA_firstname_label">First Name</string>
   <string name="actfm_ALA_lastname_label">Last Name</string>
   <string name="actfm_ALA_email_label">E-mail</string>
-  <string name="actfm_ALA_username_email_label">Brugernavn / email</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>
@@ -75,8 +69,6 @@
   <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="actfm_notification_title">Astrid.com synkroniser</string>
-  <string name="actfm_notification_comments">Ny kommentar modtaget / vælg for flere detaljer</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarmer</string>
   <string name="alarm_ACS_button">Tilføj en alarm</string>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 9c3859c21..51cac416e 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lässt Sie ihre Aufgaben online abrufen, teilen, und auf andere übertragen.</string>
   <string name="actfm_ALA_fb_login">Mit Facebook verbinden</string>
   <string name="actfm_ALA_gg_login">Mit Google verbinden</string>
-  <string name="actfm_ALA_pw_login">Kein Google oder Facebook benutzen?</string>
-  <string name="actfm_ALA_pw_link">Hier anmelden</string>
-  <string name="actfm_ALA_pw_new">Neues Konto erstellen?</string>
-  <string name="actfm_ALA_pw_returning">Haben Sie bereits ein Konto?</string>
-  <string name="actfm_ALA_name_label">Bezeichnung</string>
   <string name="actfm_ALA_firstname_label">Vorname</string>
   <string name="actfm_ALA_lastname_label">Nachname</string>
   <string name="actfm_ALA_email_label">E-Mail</string>
-  <string name="actfm_ALA_username_email_label">Benutzername / E-Mail</string>
   <string name="actfm_ALA_password_label">Passwort</string>
   <string name="actfm_ALA_signup_title">Neues Konto erstellen</string>
   <string name="actfm_ALA_login_title">Bei Astrid.com anmelden</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Astrid.com synchronisieren</string>
-  <string name="actfm_notification_comments">Neue Kommentare empfangen / klicken für mehr Details</string>
   <string name="actfm_dual_sync_warning">Sie synchrolisieren Ihre Aufgaben mit Google Tasks. Beachten Sie bitte, das das Synchronisieren mit beiden Services in einigen Fällen zu unerwarteten Ergebnissen führen kann. Sind Sie sicher, das Sie mit Astrid.com synchronisieren möchten ?</string>
   <string name="alarm_ACS_label">Alarme</string>
   <string name="alarm_ACS_button">Einen Alarm hinzufügen</string>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 88aa2c23c..060dadf32 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com le permite acceder a sus tareas en línea, compartirlas, y delegarlas en otros.</string>
   <string name="actfm_ALA_fb_login">Conectar con Facebook</string>
   <string name="actfm_ALA_gg_login">Conectar con Google</string>
-  <string name="actfm_ALA_pw_login">¿No usa Google ni Facebook?</string>
-  <string name="actfm_ALA_pw_link">Regístrese aquí</string>
-  <string name="actfm_ALA_pw_new">¿Crear una cuenta nueva?</string>
-  <string name="actfm_ALA_pw_returning">¿Ya tiene una cuenta?</string>
-  <string name="actfm_ALA_name_label">Nombre</string>
   <string name="actfm_ALA_firstname_label">Nombre</string>
   <string name="actfm_ALA_lastname_label">Apellidos</string>
   <string name="actfm_ALA_email_label">Correo electrónico</string>
-  <string name="actfm_ALA_username_email_label">Nombre de usuario / Correo electrónico</string>
   <string name="actfm_ALA_password_label">Contraseña</string>
   <string name="actfm_ALA_signup_title">Crear una cuenta nueva</string>
   <string name="actfm_ALA_login_title">Iniciar sesión en Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Sincronización de Astrid.com</string>
-  <string name="actfm_notification_comments">Nuevos comentarios recibidos / pulse para más detalles</string>
   <string name="actfm_dual_sync_warning">Estas sincronizando con Google Tasks. Tenga en cuenta que sincronizar con ambos servicios puede llevar en algunos casos a resultados inesperados. ¿Estas seguro que te quieres sincronizar con Astrid.com?</string>
   <string name="alarm_ACS_label">Alarmas</string>
   <string name="alarm_ACS_button">Añadir una alarma</string>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 7e0645d4a..85ebcb5a3 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -56,15 +56,9 @@
   <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>
   <string name="actfm_ALA_fb_login">Se connecter avec Facebook</string>
   <string name="actfm_ALA_gg_login">Se connecter avec Google</string>
-  <string name="actfm_ALA_pw_login">Vous n\'utilisez pas Google ou Facebook ?</string>
-  <string name="actfm_ALA_pw_link">S\'enregistrer ici</string>
-  <string name="actfm_ALA_pw_new">Créer un nouveau compte ?</string>
-  <string name="actfm_ALA_pw_returning">Vous avez déjà un compte ?</string>
-  <string name="actfm_ALA_name_label">Nom</string>
   <string name="actfm_ALA_firstname_label">Prénom</string>
   <string name="actfm_ALA_lastname_label">Nom</string>
   <string name="actfm_ALA_email_label">E-mail</string>
-  <string name="actfm_ALA_username_email_label">Identifiant / E-mail</string>
   <string name="actfm_ALA_password_label">Mot de passe</string>
   <string name="actfm_ALA_signup_title">Créer un nouveau compte</string>
   <string name="actfm_ALA_login_title">Connexion sur Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Synchronisation Astrid.com</string>
-  <string name="actfm_notification_comments">Nouveaux commentaires reçus / cliquez pour plus de détails</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarmes</string>
   <string name="alarm_ACS_button">Ajouter une alarme</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index f05b07d21..fe2aaf8bb 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Connect with Facebook</string>
   <string name="actfm_ALA_gg_login">Connetti con Google</string>
-  <string name="actfm_ALA_pw_login">Non utilizzi Google o Facebook?</string>
-  <string name="actfm_ALA_pw_link">Registrati qui</string>
-  <string name="actfm_ALA_pw_new">Vuoi creare un nuovo account?</string>
-  <string name="actfm_ALA_pw_returning">Hai già un account?</string>
-  <string name="actfm_ALA_name_label">Nome</string>
   <string name="actfm_ALA_firstname_label">Nome</string>
   <string name="actfm_ALA_lastname_label">Cognome</string>
   <string name="actfm_ALA_email_label">E-mail</string>
-  <string name="actfm_ALA_username_email_label">Nome utente / E-mail</string>
   <string name="actfm_ALA_password_label">Password</string>
   <string name="actfm_ALA_signup_title">Crea un nuovo account</string>
   <string name="actfm_ALA_login_title">Accedi a Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">Nessun commento ricevuto / Clicca per ulteriori dettagli</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Avvisi</string>
   <string name="alarm_ACS_button">Aggiungi un avviso</string>
diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml
index 5c9afc95d..a7add9b3b 100644
--- a/astrid/res/values-iw/strings.xml
+++ b/astrid/res/values-iw/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">אתר אסטריד מאפשר גישה מקוונת למשימות, ומאפשר לך לשתף אותן או להקצותן לאחרים</string>
   <string name="actfm_ALA_fb_login">התחבר באמצעות פייסבוק</string>
   <string name="actfm_ALA_gg_login">התחבר באמצעות גוגל</string>
-  <string name="actfm_ALA_pw_login">לא משתמש בגוגל או בפייסבוק?</string>
-  <string name="actfm_ALA_pw_link">הרשם כאן</string>
-  <string name="actfm_ALA_pw_new">ליצור חשבון חדש?</string>
-  <string name="actfm_ALA_pw_returning">כבר יש לך חשבון?</string>
-  <string name="actfm_ALA_name_label">שם</string>
   <string name="actfm_ALA_firstname_label">שם פרטי</string>
   <string name="actfm_ALA_lastname_label">שם משפחה</string>
   <string name="actfm_ALA_email_label">דוא״ל</string>
-  <string name="actfm_ALA_username_email_label">שם משתמש / דוא״ל</string>
   <string name="actfm_ALA_password_label">סיסמא</string>
   <string name="actfm_ALA_signup_title">צור חשבון חדש</string>
   <string name="actfm_ALA_login_title">התחבר לאתר אסטריד</string>
@@ -75,8 +69,6 @@
   <string name="actfm_https_title">השתמש ב־HTTPS</string>
   <string name="actfm_https_enabled">HTTPS מופעל (איטי יותר)</string>
   <string name="actfm_https_disabled">HTTPS מבוטל (מהיר יותר)</string>
-  <string name="actfm_notification_title">סינכרון עם אתר אסטריד</string>
-  <string name="actfm_notification_comments">התקבלו הערות חדשות / הקלק לפרטים</string>
   <string name="actfm_dual_sync_warning">אתה מסנכרן כעת עם ״משימות גוגל״. שים לב שסינכרון מול שני השירותים יכול במקרים מסויימים להביא לתוצאות בלתי צפויות. האם אתה בטוח שברצונך להסתנכרן גם עם אתר אסטריד?</string>
   <string name="alarm_ACS_label">התראות</string>
   <string name="alarm_ACS_button">הוסף התראה</string>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 48b4b7a4b..1c2045de3 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Facebookと接続する</string>
   <string name="actfm_ALA_gg_login">Googleと接続する</string>
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
-  <string name="actfm_ALA_pw_link">Sign In Here</string>
-  <string name="actfm_ALA_pw_new">新しいアカウントを作成しますか?</string>
-  <string name="actfm_ALA_pw_returning">すでにアカウントをお持ちですか？</string>
-  <string name="actfm_ALA_name_label">名前</string>
   <string name="actfm_ALA_firstname_label">名</string>
   <string name="actfm_ALA_lastname_label">姓</string>
   <string name="actfm_ALA_email_label">Eメール</string>
-  <string name="actfm_ALA_username_email_label">ユーザ名 / Eメール</string>
   <string name="actfm_ALA_password_label">パスワード</string>
   <string name="actfm_ALA_signup_title">新規アカウント作成</string>
   <string name="actfm_ALA_login_title">Astrid.comにログイン</string>
@@ -75,8 +69,6 @@
   <string name="actfm_https_title">HTTPS を使う</string>
   <string name="actfm_https_enabled">HTTPS有効(遅い)</string>
   <string name="actfm_https_disabled">HTTPS無効(早い)</string>
-  <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">New comments received / click for more details</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">アラーム</string>
   <string name="alarm_ACS_button">アラームを追加する</string>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index ada51c6bd..ba99500d3 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">페이스북과 연동하기</string>
   <string name="actfm_ALA_gg_login">구글과 연동하기</string>
-  <string name="actfm_ALA_pw_login">구글 또는 페이스북을 사용하지 않습니까?</string>
-  <string name="actfm_ALA_pw_link">동의하기</string>
-  <string name="actfm_ALA_pw_new">새 계정을 만드시겠습니까?</string>
-  <string name="actfm_ALA_pw_returning">이미 계정이 있으십니까?</string>
-  <string name="actfm_ALA_name_label">이름:</string>
   <string name="actfm_ALA_firstname_label">성</string>
   <string name="actfm_ALA_lastname_label">이름</string>
   <string name="actfm_ALA_email_label">이메일</string>
-  <string name="actfm_ALA_username_email_label">사용자명/이메일</string>
   <string name="actfm_ALA_password_label">비밀번호</string>
   <string name="actfm_ALA_signup_title">새 계정 만들기</string>
   <string name="actfm_ALA_login_title">로그인하기</string>
@@ -75,8 +69,6 @@
   <string name="actfm_https_title">HTTPS 사용</string>
   <string name="actfm_https_enabled">HTTPS 활성화됨 (느림)</string>
   <string name="actfm_https_disabled">HTTPS 비활성화됨 (빠름)</string>
-  <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">새로운 코멘트를 받음 / 자세히 보려면 클릭</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">알람</string>
   <string name="alarm_ACS_button">알람 추가</string>
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index 5ba99a0f3..4228a3e2c 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Connect with Facebook</string>
   <string name="actfm_ALA_gg_login">Connect with Google</string>
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
-  <string name="actfm_ALA_pw_link">Sign In Here</string>
-  <string name="actfm_ALA_pw_new">Create a new account?</string>
-  <string name="actfm_ALA_pw_returning">Already have an account?</string>
-  <string name="actfm_ALA_name_label">Name</string>
   <string name="actfm_ALA_firstname_label">First Name</string>
   <string name="actfm_ALA_lastname_label">Last Name</string>
   <string name="actfm_ALA_email_label">Email</string>
-  <string name="actfm_ALA_username_email_label">Username / Email</string>
   <string name="actfm_ALA_password_label">Passord</string>
   <string name="actfm_ALA_signup_title">Create New Account</string>
   <string name="actfm_ALA_login_title">Login to Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">New comments received / click for more details</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Varsler</string>
   <string name="alarm_ACS_button">Legg til nytt varsel</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 0ecc55195..679fcef52 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com geeft je online toegang tot je taken, deel en verdeel met anderen.</string>
   <string name="actfm_ALA_fb_login">Aanmelden via Facebook</string>
   <string name="actfm_ALA_gg_login">Aanmelden via Google</string>
-  <string name="actfm_ALA_pw_login">Geen gebruik maken van Google of Facebook?</string>
-  <string name="actfm_ALA_pw_link">Registreer hier</string>
-  <string name="actfm_ALA_pw_new">Nieuw account aanmaken?</string>
-  <string name="actfm_ALA_pw_returning">Bestaand account?</string>
-  <string name="actfm_ALA_name_label">Naam</string>
   <string name="actfm_ALA_firstname_label">Voornaam</string>
   <string name="actfm_ALA_lastname_label">Achternaam</string>
   <string name="actfm_ALA_email_label">E-mailadres</string>
-  <string name="actfm_ALA_username_email_label">Gebruikersnaam/e-mailadres</string>
   <string name="actfm_ALA_password_label">Wachtwoord</string>
   <string name="actfm_ALA_signup_title">Nieuw account aanmaken</string>
   <string name="actfm_ALA_login_title">Aanmelden bij Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Astrid.com synchronisatie</string>
-  <string name="actfm_notification_comments">Nieuw commentaar ontvangen; klik voor meer details</string>
   <string name="actfm_dual_sync_warning">Op dit moment synchroniseer je met Google Tasks. Let erop dat synchroniseren met beide diensten in sommige gevallen kan leiden tot onverwachte resultaten. Weet je zeker dat je wilt synchroniseren met Astrid.com?</string>
   <string name="alarm_ACS_label">Herinneringen</string>
   <string name="alarm_ACS_button">Voeg Alarm toe</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index 9a4cad1ec..bba2b8e9b 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com umożliwia dostęp do zadań online, udostępniania i przekazywania innym.</string>
   <string name="actfm_ALA_fb_login">Połącz z Facebookiem</string>
   <string name="actfm_ALA_gg_login">Połącz z Google</string>
-  <string name="actfm_ALA_pw_login">Nie używasz Google ani Facebooka?</string>
-  <string name="actfm_ALA_pw_link">Zarejestruj się tutaj</string>
-  <string name="actfm_ALA_pw_new">Utworzyć nowe konto?</string>
-  <string name="actfm_ALA_pw_returning">Masz już konto?</string>
-  <string name="actfm_ALA_name_label">Nazwa</string>
   <string name="actfm_ALA_firstname_label">Imię</string>
   <string name="actfm_ALA_lastname_label">Nazwisko</string>
   <string name="actfm_ALA_email_label">E-mail</string>
-  <string name="actfm_ALA_username_email_label">Użytkownik / E-mail</string>
   <string name="actfm_ALA_password_label">Hasło</string>
   <string name="actfm_ALA_signup_title">Utwórz nowe konto</string>
   <string name="actfm_ALA_login_title">Zaloguj się do Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Synchronizacja Astrid.com</string>
-  <string name="actfm_notification_comments">Otrzymano nowe komentarze / kliknij po więcej informacji</string>
   <string name="actfm_dual_sync_warning">W tej chwili korzystasz z usługi synchronizacji z usługą Google Tasks. Pamiętaj że synchronizowanie z obydwiema usługami może prowadzić do niespodziewanych efektów. Czy na pewno chcesz synchronizować z Astrid.com?</string>
   <string name="alarm_ACS_label">Alarmy</string>
   <string name="alarm_ACS_button">Dodaj alarm</string>
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index 720e2bee5..cb40add8f 100644
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com permite que você acesse tarefas online, compartilhe e delegue-as a outros.</string>
   <string name="actfm_ALA_fb_login">Conectar com Facebook</string>
   <string name="actfm_ALA_gg_login">Conectar com Google</string>
-  <string name="actfm_ALA_pw_login">Não usa Google ou Facebook?</string>
-  <string name="actfm_ALA_pw_link">Conectar aqui</string>
-  <string name="actfm_ALA_pw_new">Criar uma conta?</string>
-  <string name="actfm_ALA_pw_returning">Já possui uma conta?</string>
-  <string name="actfm_ALA_name_label">Nome</string>
   <string name="actfm_ALA_firstname_label">Nome</string>
   <string name="actfm_ALA_lastname_label">Sobrenome</string>
   <string name="actfm_ALA_email_label">Email</string>
-  <string name="actfm_ALA_username_email_label">Usuário / Email</string>
   <string name="actfm_ALA_password_label">Senha</string>
   <string name="actfm_ALA_signup_title">Criar conta</string>
   <string name="actfm_ALA_login_title">Conectar em Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Sincronizar Astrid.com</string>
-  <string name="actfm_notification_comments">Você tem novos comentários / clique para mais detalhes</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarmes</string>
   <string name="alarm_ACS_button">Inserir alarme</string>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index c71ed089a..1ed9363f0 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Connect with Facebook</string>
   <string name="actfm_ALA_gg_login">Connect with Google</string>
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
-  <string name="actfm_ALA_pw_link">Sign In Here</string>
-  <string name="actfm_ALA_pw_new">Create a new account?</string>
-  <string name="actfm_ALA_pw_returning">Already have an account?</string>
-  <string name="actfm_ALA_name_label">Name</string>
   <string name="actfm_ALA_firstname_label">First Name</string>
   <string name="actfm_ALA_lastname_label">Last Name</string>
   <string name="actfm_ALA_email_label">Email</string>
-  <string name="actfm_ALA_username_email_label">Username / Email</string>
   <string name="actfm_ALA_password_label">Password</string>
   <string name="actfm_ALA_signup_title">Create New Account</string>
   <string name="actfm_ALA_login_title">Login to Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">New comments received / click for more details</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarmes</string>
   <string name="alarm_ACS_button">Adicionar um Alarme</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 340fd970d..492313f68 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com позволяет Вам получать доступ к вашим задачам онлайн, обмениваться ими и поручать их другим.</string>
   <string name="actfm_ALA_fb_login">Подключиться к Facebook</string>
   <string name="actfm_ALA_gg_login">Подключиться к Google</string>
-  <string name="actfm_ALA_pw_login">Не используете Google и Facebook?</string>
-  <string name="actfm_ALA_pw_link">Авторизоваться</string>
-  <string name="actfm_ALA_pw_new">Создать учетную запись?</string>
-  <string name="actfm_ALA_pw_returning">Уже есть учетная запись?</string>
-  <string name="actfm_ALA_name_label">Имя</string>
   <string name="actfm_ALA_firstname_label">Имя</string>
   <string name="actfm_ALA_lastname_label">Фамилия</string>
   <string name="actfm_ALA_email_label">Эл. почта</string>
-  <string name="actfm_ALA_username_email_label">Имя пользователя / Эл. почта</string>
   <string name="actfm_ALA_password_label">Пароль</string>
   <string name="actfm_ALA_signup_title">Создать новую учётную запись</string>
   <string name="actfm_ALA_login_title">Авторизоваться на Astrid.com</string>
@@ -75,8 +69,6 @@
   <string name="actfm_https_title">Использовать HTTPS</string>
   <string name="actfm_https_enabled">HTTPS включен (медленнее)</string>
   <string name="actfm_https_disabled">HTTPS отключен (быстрее)</string>
-  <string name="actfm_notification_title">Astrid.com Синхронизация</string>
-  <string name="actfm_notification_comments">Получены новые комментарии / нажмите для детального просмотра</string>
   <string name="actfm_dual_sync_warning">Сейчас происходит синхронизация с Google Tasks. Имейте в виду, что синхронизация с обеими службами в некоторых случаях может привести к ошибкам. Вы уверены, что хотите синхронизироваться с Astrid.com?</string>
   <string name="alarm_ACS_label">Напоминания</string>
   <string name="alarm_ACS_button">Добавить напоминание</string>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index f32f7be98..964d731d3 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -56,15 +56,9 @@
   <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>
   <string name="actfm_ALA_fb_login">Logga in med Facebook</string>
   <string name="actfm_ALA_gg_login">Logga in med Facebook</string>
-  <string name="actfm_ALA_pw_login">Använder du inte Google eller Facebook?</string>
-  <string name="actfm_ALA_pw_link">Logga in här</string>
-  <string name="actfm_ALA_pw_new">Skapa ett nytt konto?</string>
-  <string name="actfm_ALA_pw_returning">Har du redan ett konto?</string>
-  <string name="actfm_ALA_name_label">Namn</string>
   <string name="actfm_ALA_firstname_label">Förnamn</string>
   <string name="actfm_ALA_lastname_label">Efternamn</string>
   <string name="actfm_ALA_email_label">E-postadress</string>
-  <string name="actfm_ALA_username_email_label">Användarnamn/e-postadress</string>
   <string name="actfm_ALA_password_label">Lösenord</string>
   <string name="actfm_ALA_signup_title">Skapa nytt konto</string>
   <string name="actfm_ALA_login_title">Logga in på Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Synkronisering med Astrid.com</string>
-  <string name="actfm_notification_comments">Ny kommentar mottagen, klicka för detaljer</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarm</string>
   <string name="alarm_ACS_button">Lägg till ett alarm</string>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index 1f287ee9e..7f8060bef 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com lets you access your tasks online, share, and delegate with others.</string>
   <string name="actfm_ALA_fb_login">Connect with Facebook</string>
   <string name="actfm_ALA_gg_login">Connect with Google</string>
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
-  <string name="actfm_ALA_pw_link">Sign In Here</string>
-  <string name="actfm_ALA_pw_new">Create a new account?</string>
-  <string name="actfm_ALA_pw_returning">Already have an account?</string>
-  <string name="actfm_ALA_name_label">Name</string>
   <string name="actfm_ALA_firstname_label">First Name</string>
   <string name="actfm_ALA_lastname_label">Last Name</string>
   <string name="actfm_ALA_email_label">Email</string>
-  <string name="actfm_ALA_username_email_label">Username / Email</string>
   <string name="actfm_ALA_password_label">รหัสผ่าน</string>
   <string name="actfm_ALA_signup_title">Create New Account</string>
   <string name="actfm_ALA_login_title">Login to Astrid.com</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Astrid.com Sync</string>
-  <string name="actfm_notification_comments">New comments received / click for more details</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">Alarms</string>
   <string name="alarm_ACS_button">Add an Alarm</string>
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index 6788f3994..04daca2c7 100644
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -56,15 +56,9 @@
   <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>
   <string name="actfm_ALA_fb_login">Facebook ile bağlan</string>
   <string name="actfm_ALA_gg_login">Google ile bağlan</string>
-  <string name="actfm_ALA_pw_login">Google veya Facebook kullanmıyor musunuz?</string>
-  <string name="actfm_ALA_pw_link">Giriş Yap</string>
-  <string name="actfm_ALA_pw_new">Yeni Bir Hesap Aç</string>
-  <string name="actfm_ALA_pw_returning">Zaten üye misiniz?</string>
-  <string name="actfm_ALA_name_label">İsim</string>
   <string name="actfm_ALA_firstname_label">Ad</string>
   <string name="actfm_ALA_lastname_label">Soyad</string>
   <string name="actfm_ALA_email_label">E-Posta</string>
-  <string name="actfm_ALA_username_email_label">Kullanıcı Adı / E-Posta</string>
   <string name="actfm_ALA_password_label">Parola</string>
   <string name="actfm_ALA_signup_title">Yeni Hesap Oluştur</string>
   <string name="actfm_ALA_login_title">Astrid.com\'a Bağlan</string>
@@ -75,8 +69,6 @@
   <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>
-  <string name="actfm_notification_title">Astrid.com Eşleşterime</string>
-  <string name="actfm_notification_comments">Yeni yorum alındı / ayrıntılar için tıklayın</string>
   <string name="actfm_dual_sync_warning">Google Görevleri ile eşleştirme yapıyordunuz. Her iki hizmetle eşleştirme yapmanız istenmeyen sonuçlara sebep olabilir. Astrid.com ile eşleştirmek istediğinize emin misiniz?</string>
   <string name="alarm_ACS_label">Alarmlar</string>
   <string name="alarm_ACS_button">Alarm Ekle</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 0584e8d6c..3abdc1099 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -54,15 +54,9 @@
   <string name="actfm_ALA_body">Astrid.com能让您轻松在线访问、共享和委托您的任务。</string>
   <string name="actfm_ALA_fb_login">使用Facebook帐号登录</string>
   <string name="actfm_ALA_gg_login">使用Google帐号登录</string>
-  <string name="actfm_ALA_pw_login">尚未拥有Google或Facebook帐号？</string>
-  <string name="actfm_ALA_pw_link">点此登录</string>
-  <string name="actfm_ALA_pw_new">创建新帐户？</string>
-  <string name="actfm_ALA_pw_returning">已有帐户？</string>
-  <string name="actfm_ALA_name_label">名字</string>
   <string name="actfm_ALA_firstname_label">名字</string>
   <string name="actfm_ALA_lastname_label">姓氏</string>
   <string name="actfm_ALA_email_label">电子邮箱</string>
-  <string name="actfm_ALA_username_email_label">用户名/电子邮箱</string>
   <string name="actfm_ALA_password_label">密码</string>
   <string name="actfm_ALA_signup_title">创建新账户</string>
   <string name="actfm_ALA_login_title">登陆至 Astrid.com</string>
@@ -72,8 +66,6 @@
   <string name="actfm_https_title">使用 HTTPS</string>
   <string name="actfm_https_enabled">开启 HTTPS</string>
   <string name="actfm_https_disabled">关闭 HTTPS</string>
-  <string name="actfm_notification_title">Astrid.com 同步</string>
-  <string name="actfm_notification_comments">收到新留言/点击察看细节</string>
   <string name="alarm_ACS_label">闹钟</string>
   <string name="alarm_ACS_button">添加闹钟</string>
   <string-array name="reminders_alarm">
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 60dea21a1..ecc6b4656 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -56,15 +56,9 @@
   <string name="actfm_ALA_body">Astrid.com讓你在線上存取你的工作表，與朋友分享或委派工作。</string>
   <string name="actfm_ALA_fb_login">連接到Facebook賬戶</string>
   <string name="actfm_ALA_gg_login">連接到Google賬戶</string>
-  <string name="actfm_ALA_pw_login">沒有 Google 或 Facebook 賬戶?</string>
-  <string name="actfm_ALA_pw_link">在此登入</string>
-  <string name="actfm_ALA_pw_new">建立新帳號</string>
-  <string name="actfm_ALA_pw_returning">已有帳戶？</string>
-  <string name="actfm_ALA_name_label">姓名</string>
   <string name="actfm_ALA_firstname_label">名字</string>
   <string name="actfm_ALA_lastname_label">姓氏</string>
   <string name="actfm_ALA_email_label">電郵地址</string>
-  <string name="actfm_ALA_username_email_label">用戶名稱/電郵地址</string>
   <string name="actfm_ALA_password_label">密碼</string>
   <string name="actfm_ALA_signup_title">建立新帳號</string>
   <string name="actfm_ALA_login_title">登入Asrid.com</string>
@@ -75,8 +69,6 @@
   <string name="actfm_https_title">使用 HTTPS</string>
   <string name="actfm_https_enabled">使用 HTTPS (緩慢)</string>
   <string name="actfm_https_disabled">不使用 HTTPS (較快)</string>
-  <string name="actfm_notification_title">Astrid.com 同步</string>
-  <string name="actfm_notification_comments">收到新的備註 / 點擊觀看</string>
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. Be advised that synchronizing with both services can in some cases lead to unexpected results. Are you sure you want to sync with Astrid.com?</string>
   <string name="alarm_ACS_label">警示</string>
   <string name="alarm_ACS_button">加入警示</string>
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index dde5cb8df..d04b7832c 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -212,19 +212,14 @@
   <string name="actfm_ALA_gg_login">Connect with Google</string>
   
   <!-- share login: Sharing Footer Password Label -->
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
 
   <!-- share login: Sharing Password Link -->
-  <string name="actfm_ALA_pw_link">Sign In Here</string>
 
   <!-- share login: Password Are you a New User? -->
-  <string name="actfm_ALA_pw_new">Create a new account?</string>
 
   <!-- share login: Password Are you a Returning User? -->
-  <string name="actfm_ALA_pw_returning">Already have an account?</string>
 
   <!-- share login: Name -->
-  <string name="actfm_ALA_name_label">Name</string>
 
   <!-- share login: Name -->
   <string name="actfm_ALA_firstname_label">First Name</string>
@@ -236,7 +231,6 @@
   <string name="actfm_ALA_email_label">Email</string>
 
   <!-- share login: Username / Email -->
-  <string name="actfm_ALA_username_email_label">Username / Email</string>
 
   <!-- share login: Password -->
   <string name="actfm_ALA_password_label">Password</string>
@@ -280,10 +274,8 @@
   <string name="actfm_https_disabled">HTTPS disabled (faster)</string>
 
   <!-- title for notification tray after synchronizing -->
-  <string name="actfm_notification_title">Astrid.com Sync</string>
   
   <!-- text for notification when comments are received -->
-  <string name="actfm_notification_comments">New comments received / click for more details</string>
     
   <string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks. 
       Be advised that synchronizing with both services can in some cases lead to unexpected results. 
@@ -299,7 +291,6 @@
   
   <string name="actfm_account_premium">Premium</string>
   <string name="actfm_account_basic">Basic</string>
-  <string name="actfm_account_none">None</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>