diff --git a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
index f4e9bdf8a..5805a9fd2 100644
--- a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
+++ b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java
@@ -273,6 +273,6 @@ public class FilterCriteriaProvider {
         values,
         names,
         ids,
-        context.getString(R.string.CFC_caldav_list_name));
+        context.getString(R.string.CFC_list_name));
   }
 }
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index fb07fcb05..1c3bb07a3 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -145,7 +145,6 @@
     <string name="gcal_completed_title">%s (завършено)</string>
     <string name="CFC_gtasks_list_text">В списък: ?</string>
     <string name="CFC_gtasks_list_name">В списък GTasks…</string>
-    <string name="CFC_caldav_list_name">В CalDAV списък…</string>
     <string name="gtasks_GTA_clear_completed">Изчисти Завършени</string>
     <string name="gtasks_GLA_authenticating">Удостоверява се…</string>
     <string name="gtasks_GLA_errorIOAuth">Съжаляваме, ние имахме проблем с комуникацията със сървърите на Google. Моля, опитайте отново по-късно.</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bb86a10ec..b413059be 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -470,7 +470,6 @@
     <string name="requires_pro_subscription">Vyžaduje PRO předplatné</string>
     <string name="logout">Odhlásit se</string>
     <string name="this_feature_requires_a_subscription">Tato funkce vyžaduje odběr</string>
-    <string name="CFC_caldav_list_name">V CalDAV seznamu…</string>
     <string name="repeat_minutely">OPAKOVAT KAŽDOU MINUTU</string>
     <string name="repeat_number_of_times">Opakovat několikrát</string>
     <string name="when_overdue">Po termínu</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5be356217..875be501e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -141,7 +141,6 @@
     <string name="gcal_completed_title">%s (abgeschlossen)</string>
     <string name="CFC_gtasks_list_text">In der Liste: ?</string>
     <string name="CFC_gtasks_list_name">In GTasks-Liste …</string>
-    <string name="CFC_caldav_list_name">In CalDAV-Liste…</string>
     <string name="gtasks_GTA_clear_completed">Erledigte Aufgaben entfernen</string>
     <string name="gtasks_GLA_authenticating">Authentifizierung…</string>
     <string name="gtasks_GLA_errorIOAuth">Leider ist während der Kommunikation mit den Google-Servern ein Problem aufgetreten. Bitte versuchen Sie es später noch einmal.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 83659c430..ae5a57ba0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -146,7 +146,6 @@
     <string name="gcal_completed_title">%s (completado)</string>
     <string name="CFC_gtasks_list_text">En la Lista: ?</string>
     <string name="CFC_gtasks_list_name">en la Lista GTasks…</string>
-    <string name="CFC_caldav_list_name">En lista CalDAV…</string>
     <string name="gtasks_GTA_clear_completed">Quitar finalizadas</string>
     <string name="gtasks_GLA_authenticating">Autenticando…</string>
     <string name="gtasks_GLA_errorIOAuth">Perdón, hubo un problema al comunicarse con los servidores de Google. Por favor inténtalo mas tarde.</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 16f1d46cb..42f46ce43 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -109,7 +109,6 @@
     <string name="gcal_completed_title">%s (valmis)</string>
     <string name="CFC_gtasks_list_text">Nimekirjas: \?</string>
     <string name="CFC_gtasks_list_name">GTasks nimekirjas…</string>
-    <string name="CFC_caldav_list_name">CalDAV nimekirjas…</string>
     <string name="gtasks_GTA_clear_completed">Eemalda lõpetatud</string>
     <string name="gtasks_GLA_authenticating">Autentimine…</string>
     <string name="gtasks_GPr_header">Google Tasks</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 098978366..ec5aa559b 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -147,7 +147,6 @@
     <string name="gcal_completed_title">%s (burututa)</string>
     <string name="CFC_gtasks_list_text">Zerrendan: \?</string>
     <string name="CFC_gtasks_list_name">GTasks zerrendan…</string>
-    <string name="CFC_caldav_list_name">CalDAV zerrendan…</string>
     <string name="gtasks_GTA_clear_completed">Kendu burututakoak</string>
     <string name="gtasks_GLA_authenticating">Autentifikatzen…</string>
     <string name="gtasks_GLA_errorIOAuth">Google zerbitzariekin komunikatzeko arazo bat izan dugu. Saiatu geroago.</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 9926b9f35..2b71f731f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -544,7 +544,6 @@
     <string name="select_all">Valitse kaikki</string>
     <string name="widget_show_menu">Näytä valikko</string>
     <string name="widget_hide_background">Piilota tausta</string>
-    <string name="CFC_caldav_list_name">CalDAV lista…</string>
     <string name="sort_created">Luontiajan mukaan</string>
     <string name="widget_show_dividers">Näytä jakajat</string>
     <string name="got_it">Selvä!</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d666ba23e..7ff28d14f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -139,7 +139,6 @@
     <string name="gcal_completed_title">%s (complété)</string>
     <string name="CFC_gtasks_list_text">Dans la liste : ?</string>
     <string name="CFC_gtasks_list_name">Dans la liste GTasks…</string>
-    <string name="CFC_caldav_list_name">Dans la liste CalDAV…</string>
     <string name="gtasks_GTA_clear_completed">Effacer les tâches terminés</string>
     <string name="gtasks_GLA_authenticating">Authentification en cours…</string>
     <string name="gtasks_GLA_errorIOAuth">Erreur de communication avec les serveurs Google. Veuillez essayer plus tard.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0cfd8e1a7..bb04b0798 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -145,7 +145,6 @@
     <string name="gcal_completed_title">%s (befejezve)</string>
     <string name="CFC_gtasks_list_text">Listában: ?</string>
     <string name="CFC_gtasks_list_name">Ebben a GTasks listában…</string>
-    <string name="CFC_caldav_list_name">A CalDAV listában…</string>
     <string name="gtasks_GTA_clear_completed">Elvégzettek törlése</string>
     <string name="gtasks_GLA_authenticating">Azonosítás…</string>
     <string name="gtasks_GLA_errorIOAuth">Sajnáljuk, de hiba történt a Google szervereivel való kommunikálás során. Próbáld újra később.</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 2875784bc..dbbea5227 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -100,7 +100,6 @@
     <string name="gcal_completed_title">%s (selesai)</string>
     <string name="CFC_gtasks_list_text">Dalam Daftar: \?</string>
     <string name="CFC_gtasks_list_name">Dalam Daftar GTasks…</string>
-    <string name="CFC_caldav_list_name">Dalam daftar CalDAV…</string>
     <string name="gtasks_GLA_authenticating">Mengotentikasi…</string>
     <string name="gtasks_GLA_errorIOAuth">Maaf, terjadi kesalahan komunikasi dengan server Google. Silakan coba lagi nanti.</string>
     <string name="gtasks_GPr_header">Google Tasks</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a5b4280ab..fc7eeb85c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -142,7 +142,6 @@
     <string name="gcal_completed_title">%s (completato)</string>
     <string name="CFC_gtasks_list_text">Nella lista: ?</string>
     <string name="CFC_gtasks_list_name">Nella lista GTasks…</string>
-    <string name="CFC_caldav_list_name">In lista CalDAV…</string>
     <string name="gtasks_GTA_clear_completed">Elimina attività completate</string>
     <string name="gtasks_GLA_authenticating">Autenticazione…</string>
     <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>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 9ee627140..c1cd35314 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -147,7 +147,6 @@
     <string name="gcal_completed_title">%s (בוצעה)</string>
     <string name="CFC_gtasks_list_text">ברשימה: ?</string>
     <string name="CFC_gtasks_list_name">ברשימה של „משימות גוגל”…</string>
-    <string name="CFC_caldav_list_name">ברשימת CalDAV…</string>
     <string name="gtasks_GTA_clear_completed">נקה משימות שבוצעו</string>
     <string name="gtasks_GLA_authenticating">מתבצע אימות…</string>
     <string name="gtasks_GLA_errorIOAuth">בעיה בהתחברות לשרתי גוגל. נא נסה שוב מאוחר יותר.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 81bb3ec79..d8d6ae281 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -142,7 +142,6 @@
     <string name="gcal_completed_title">%s（完了）</string>
     <string name="CFC_gtasks_list_text">リストにありますか ?</string>
     <string name="CFC_gtasks_list_name">GTasks リストに…</string>
-    <string name="CFC_caldav_list_name">CalDAV リスト内…</string>
     <string name="gtasks_GTA_clear_completed">クリアが完了しました</string>
     <string name="gtasks_GLA_authenticating">認証中…</string>
     <string name="gtasks_GLA_errorIOAuth">すみません、Googleのサーバとの通信で問題が発生しました。しばらくしてから再度やり直してください。</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c9e048e6f..ef64948c2 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -145,7 +145,6 @@
     <string name="gcal_completed_title">%s (완료)</string>
     <string name="CFC_gtasks_list_text">목록에: ?</string>
     <string name="CFC_gtasks_list_name">GTasks 목록에…</string>
-    <string name="CFC_caldav_list_name">CalDAV 목록에…</string>
     <string name="gtasks_GTA_clear_completed">완료한 할일 지우기</string>
     <string name="gtasks_GLA_authenticating">인증 중…</string>
     <string name="gtasks_GLA_errorIOAuth">죄송합니다, 구글 서버와 통신하는 데 문제가 있습니다. 잠시 후 다시 시도하세요.</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index bbe4893d9..bcacee802 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -142,7 +142,6 @@
     <string name="gcal_completed_title">%s (užbaigta)</string>
     <string name="CFC_gtasks_list_text">Yra sąraše ?</string>
     <string name="CFC_gtasks_list_name">Yra GTasks sąraše…</string>
-    <string name="CFC_caldav_list_name">CalDAV sąraše</string>
     <string name="gtasks_GTA_clear_completed">Išvalyti užbaigtus</string>
     <string name="gtasks_GLA_authenticating">Autorizuojama…</string>
     <string name="gtasks_GLA_errorIOAuth">Atsiprašome, turime bėdų susisiekiant su Google serveriais. Prašome pabandyti vėliau.</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 50dab2f55..edc5984e8 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -243,7 +243,6 @@
     <string name="delete_calendar_event_confirmation">Slett kalenderhendelse\?</string>
     <string name="calendar_event_not_found">Fant ikke kalenderhendelsen</string>
     <string name="CFC_gtasks_list_name">I GTask-listen…</string>
-    <string name="CFC_caldav_list_name">I CalDAV-liste…</string>
     <string name="gtasks_GLA_authenticating">Identitetsbekrefter…</string>
     <string name="gtasks_GPr_header">Google Tasks</string>
     <string name="gtasks_error_accountNotFound">Kontoen %s ble ikke funnet, logg ut og inn igjen fra Google Tasks-innstillingene.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 31c04d458..9362d47e9 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -141,7 +141,6 @@
     <string name="gcal_completed_title">%s (voltooid)</string>
     <string name="CFC_gtasks_list_text">In lijst: ?</string>
     <string name="CFC_gtasks_list_name">In GTaken lijst…</string>
-    <string name="CFC_caldav_list_name">In CalDAV lijst…</string>
     <string name="gtasks_GTA_clear_completed">Verwijderen Voltooid</string>
     <string name="gtasks_GLA_authenticating">Verifiëren…</string>
     <string name="gtasks_GLA_errorIOAuth">Sorry, we konden geen verbinding maken met de servers van Google. Probeer het later opnieuw.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 09d5991cb..56a98aec5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -141,7 +141,6 @@
     <string name="gcal_completed_title">%s (ukończono)</string>
     <string name="CFC_gtasks_list_text">Na liście: ?</string>
     <string name="CFC_gtasks_list_name">Na liście GTasks…</string>
-    <string name="CFC_caldav_list_name">Na liście CalDAV…</string>
     <string name="gtasks_GTA_clear_completed">Wyczyść zakończone</string>
     <string name="gtasks_GLA_authenticating">Uwierzytelnianie…</string>
     <string name="gtasks_GLA_errorIOAuth">Przepraszamy, mieliśmy problem z porozumieniem się z serwerami Google. Prosimy spróbować ponownie.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 055502a08..9f0cb5745 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -142,7 +142,6 @@
     <string name="gcal_completed_title">%s (concluído)</string>
     <string name="CFC_gtasks_list_text">Na lista: ?</string>
     <string name="CFC_gtasks_list_name">No Google Tasks…</string>
-    <string name="CFC_caldav_list_name">Na lista CalDAV…</string>
     <string name="gtasks_GTA_clear_completed">Limpar Concluídas</string>
     <string name="gtasks_GLA_authenticating">Autenticando …</string>
     <string name="gtasks_GLA_errorIOAuth">Desculpe-nos, tivemos problemas de comunicação com os servidores do Google. Tente mais tarde.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8d1345dd1..2fba1cd84 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -147,7 +147,6 @@
     <string name="gcal_completed_title">%s (выполнено)</string>
     <string name="CFC_gtasks_list_text">В списке: \?</string>
     <string name="CFC_gtasks_list_name">В списке GTasks…</string>
-    <string name="CFC_caldav_list_name">В списке CalDAV…</string>
     <string name="gtasks_GTA_clear_completed">Очистить завершенные</string>
     <string name="gtasks_GLA_authenticating">Авторизация…</string>
     <string name="gtasks_GLA_errorIOAuth">При обращении к серверам Google возникли проблемы. Пожалуйста, попробуйте позже.</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index afad17bc2..b0346a392 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -142,7 +142,6 @@
     <string name="gcal_completed_title">%s (dokončené)</string>
     <string name="CFC_gtasks_list_text">V zozname: ?</string>
     <string name="CFC_gtasks_list_name">V zozname GTasks…</string>
-    <string name="CFC_caldav_list_name">V zozname CalDAV …</string>
     <string name="gtasks_GTA_clear_completed">Vymazať dokončené</string>
     <string name="gtasks_GLA_authenticating">Overovanie…</string>
     <string name="gtasks_GLA_errorIOAuth">Prepáč, nastal problém v komunikácii s Google serverom. Prosím, skús to znovu neskôr.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 23bdb7638..a69caedea 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -285,7 +285,6 @@
     <string name="default_location_reminder_on_arrival">Vid ankomst</string>
     <string name="default_location_reminder_on_departure">Vid avgång</string>
     <string name="default_location_reminder_on_arrival_or_departure">Vid ankomst och avgång</string>
-    <string name="CFC_caldav_list_name">I CalDAV-lista…</string>
     <string name="snooze_all">Snooza alla</string>
     <string name="repeat_every">Varje</string>
     <string name="repeat_option_does_not_repeat">Repeteras inte</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index eb3d43e71..794760683 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -147,7 +147,6 @@
     <string name="gcal_completed_title">%s (tamamlandı)</string>
     <string name="CFC_gtasks_list_text">Liste içinde: ?</string>
     <string name="CFC_gtasks_list_name">Gtasks Listesi içinde…</string>
-    <string name="CFC_caldav_list_name">CalDAV listesinde…</string>
     <string name="gtasks_GTA_clear_completed">Tamamlanları Temizle</string>
     <string name="gtasks_GLA_authenticating">Kimlik doğrulanıyor…</string>
     <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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a53798d1e..b4eb18b0f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -145,7 +145,6 @@
     <string name="gcal_completed_title">%s (завершено)</string>
     <string name="CFC_gtasks_list_text">В списку: ?</string>
     <string name="CFC_gtasks_list_name">В GTasks списку…</string>
-    <string name="CFC_caldav_list_name">В CalDAV списку…</string>
     <string name="gtasks_GTA_clear_completed">Очистити завершені</string>
     <string name="gtasks_GLA_authenticating">Автентифікація…</string>
     <string name="gtasks_GLA_errorIOAuth">Вибачте, проблеми при зверненні до серверів Google. Будь ласка, спробуйте пізніше.</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 152563d39..51f61c997 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -135,7 +135,6 @@
     <string name="gcal_completed_title">%s (已完成)</string>
     <string name="CFC_gtasks_list_text">列表内容: ?</string>
     <string name="CFC_gtasks_list_name">在GTasks列表…</string>
-    <string name="CFC_caldav_list_name">在 CalDAV 列表…</string>
     <string name="gtasks_GTA_clear_completed">清除已完成项</string>
     <string name="gtasks_GLA_authenticating">验证中…</string>
     <string name="gtasks_GLA_errorIOAuth">对不起，我们在与 Google 服务器通讯时遇到了问题。请稍后再尝试。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2952ae6ac..ebe3b1adf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -157,7 +157,7 @@ File %1$s contained %2$s.\n\n
   <string name="gcal_completed_title">%s (completed)</string>
   <string name="CFC_gtasks_list_text">In List: ?</string>
   <string name="CFC_gtasks_list_name">In GTasks List…</string>
-  <string name="CFC_caldav_list_name">In CalDAV list…</string>
+  <string name="CFC_list_name">In list…</string>
   <string name="gtasks_GTA_clear_completed">Clear Completed</string>
   <string name="gtasks_GLA_authenticating">Authenticating…</string>
   <string name="gtasks_GLA_errorIOAuth">Sorry, we had trouble communicating with Google servers. Please try again later.</string>