diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 78cb0103c3..a7d7459ae7 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakte</string>
   <string name="ContactsCursorLoader_groups">Groepe</string>
   <string name="ContactsCursorLoader_phone_number_search">Foonnommer-soek</string>
-  <string name="ContactsCursorLoader_username_search">Gebruikersnaam-soek</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Gebruikersnaam-soek</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">My Stories</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 78262f9a6a..8d4a0d3621 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -171,7 +171,7 @@
   <string name="ContactsCursorLoader_contacts">جهات الاتصال</string>
   <string name="ContactsCursorLoader_groups">المجموعات</string>
   <string name="ContactsCursorLoader_phone_number_search">البحث عن طريق رقم الهاتف</string>
-  <string name="ContactsCursorLoader_username_search">البحث عن طريق اسم المستخدم</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">البحث عن طريق اسم المستخدم</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">قصصي</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 26c8f2f4e7..fa3ed8b925 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Əlaqələr</string>
   <string name="ContactsCursorLoader_groups">Qruplar</string>
   <string name="ContactsCursorLoader_phone_number_search">Telefon nömrəsi ilə axtar</string>
-  <string name="ContactsCursorLoader_username_search">İstifadəçi adı ilə axtar</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">İstifadəçi adı ilə axtar</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Hekayələrim</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 6b428388f5..2e9419fa66 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Контакти</string>
   <string name="ContactsCursorLoader_groups">Групи</string>
   <string name="ContactsCursorLoader_phone_number_search">Търсене по телефонен номер</string>
-  <string name="ContactsCursorLoader_username_search">Търсене по потребителско име</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Търсене по потребителско име</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Моите истории</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 1efe0749d4..c6a976a0c0 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">পরিচিতিসমূহ</string>
   <string name="ContactsCursorLoader_groups">গ্রুপসমূহ</string>
   <string name="ContactsCursorLoader_phone_number_search">ফোন নাম্বার খুঁজুন</string>
-  <string name="ContactsCursorLoader_username_search">ইউজারনেম খুঁজুন</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ইউজারনেম খুঁজুন</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">আমার স্টোরি</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 337aece175..1cb7dd4e06 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakti</string>
   <string name="ContactsCursorLoader_groups">Grupe</string>
   <string name="ContactsCursorLoader_phone_number_search">Pretraživanje po broju</string>
-  <string name="ContactsCursorLoader_username_search">Pretraživanje po korisničkom imenu</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Pretraživanje po korisničkom imenu</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Moje priče</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index e8de5ff85b..09903cffe9 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Contactes</string>
   <string name="ContactsCursorLoader_groups">Grups</string>
   <string name="ContactsCursorLoader_phone_number_search">Cerca de número de telèfon</string>
-  <string name="ContactsCursorLoader_username_search">Cerca de nom d\'usuari</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Cerca de nom d\'usuari</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Les meves històries</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e033fc33cb..9e84e60711 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakty</string>
   <string name="ContactsCursorLoader_groups">Skupiny</string>
   <string name="ContactsCursorLoader_phone_number_search">Vyhledání telefonního čísla</string>
-  <string name="ContactsCursorLoader_username_search">Vyhledání uživatelského jména</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Vyhledání uživatelského jména</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mé příběhy</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 99c07342be..0b4e2c44fb 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Cysylltiadau</string>
   <string name="ContactsCursorLoader_groups">Grwpiau</string>
   <string name="ContactsCursorLoader_phone_number_search">Chwiliad rhif ffôn</string>
-  <string name="ContactsCursorLoader_username_search">Chwiliad enw defnyddiwr</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Chwiliad enw defnyddiwr</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Fy straeon</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 5ee32e15f4..7d81f69c59 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakter</string>
   <string name="ContactsCursorLoader_groups">Grupper</string>
   <string name="ContactsCursorLoader_phone_number_search">Søg telefonnummer</string>
-  <string name="ContactsCursorLoader_username_search">Søg brugernavn</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Søg brugernavn</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mine historier</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 145e58c587..2a5ad0d16c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakte</string>
   <string name="ContactsCursorLoader_groups">Gruppen</string>
   <string name="ContactsCursorLoader_phone_number_search">Rufnummernsuche</string>
-  <string name="ContactsCursorLoader_username_search">Nutzernamensuche</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Nutzernamensuche</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Meine Stories</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 502d0480be..7cec3bbbe8 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Επαφές</string>
   <string name="ContactsCursorLoader_groups">Ομάδες</string>
   <string name="ContactsCursorLoader_phone_number_search">Εύρεση τηλεφωνικού αριθμού</string>
-  <string name="ContactsCursorLoader_username_search">Εύρεση ονόματος χρήστη</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Εύρεση ονόματος χρήστη</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Οι ιστορίες μου</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index ecbb367e3e..020bebc5ab 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontaktaro</string>
   <string name="ContactsCursorLoader_groups">Grupoj</string>
   <string name="ContactsCursorLoader_phone_number_search">Serĉo de telefonnumero</string>
-  <string name="ContactsCursorLoader_username_search">Serĉo de uzantnomo</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Serĉo de uzantnomo</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Miaj rakontoj</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ff18badf1b..bd9f746350 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Personas</string>
   <string name="ContactsCursorLoader_groups">Grupos</string>
   <string name="ContactsCursorLoader_phone_number_search">Buscar número de teléfono</string>
-  <string name="ContactsCursorLoader_username_search">Buscar por alias (nombre de usuari@)</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Buscar por alias (nombre de usuari@)</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mis historias</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 70343783ed..2ae065cc31 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontaktid</string>
   <string name="ContactsCursorLoader_groups">Grupid</string>
   <string name="ContactsCursorLoader_phone_number_search">Telefoninumbri otsing</string>
-  <string name="ContactsCursorLoader_username_search">Kasutajanime otsing</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Kasutajanime otsing</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Minu lood</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index e8bd1b0e35..8ff637668b 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontaktuak</string>
   <string name="ContactsCursorLoader_groups">Taldeak</string>
   <string name="ContactsCursorLoader_phone_number_search">Telefono zenbakia bilatu</string>
-  <string name="ContactsCursorLoader_username_search">Erabiltzaile izena bilatu</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Erabiltzaile izena bilatu</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Nire istorioak</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 8fc6cb94b9..6182797ad7 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">مخاطبین</string>
   <string name="ContactsCursorLoader_groups">گروه‌ها‌</string>
   <string name="ContactsCursorLoader_phone_number_search">جستجوی شماره‌تلفن</string>
-  <string name="ContactsCursorLoader_username_search">جستجوی نام کاربری</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">جستجوی نام کاربری</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">داستان‌های من</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3b99314d7f..f358c593cd 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Yhteystiedot</string>
   <string name="ContactsCursorLoader_groups">Ryhmät</string>
   <string name="ContactsCursorLoader_phone_number_search">Puhelinnumerohaku</string>
-  <string name="ContactsCursorLoader_username_search">Käyttäjätunnushaku</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Käyttäjätunnushaku</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Omat tarinat</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 569d398707..18491ef8b5 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Contacts</string>
   <string name="ContactsCursorLoader_groups">Groupes</string>
   <string name="ContactsCursorLoader_phone_number_search">Recherche par numéro de téléphone</string>
-  <string name="ContactsCursorLoader_username_search">Recherche par nom d’utilisateur</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Recherche par nom d’utilisateur</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mes histoires</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-fy/strings.xml b/app/src/main/res/values-fy/strings.xml
index 18d0a6fa46..cd247a59a6 100644
--- a/app/src/main/res/values-fy/strings.xml
+++ b/app/src/main/res/values-fy/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakten</string>
   <string name="ContactsCursorLoader_groups">Groepen</string>
   <string name="ContactsCursorLoader_phone_number_search">Sykje op telefoannûmer</string>
-  <string name="ContactsCursorLoader_username_search">Sykje op brûkersnamme</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Sykje op brûkersnamme</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Myn ferhalen</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index b7a4a545f1..755c26f94b 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Contactos</string>
   <string name="ContactsCursorLoader_groups">Grupos</string>
   <string name="ContactsCursorLoader_phone_number_search">Buscar número de teléfono</string>
-  <string name="ContactsCursorLoader_username_search">Buscar nome de usuario</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Buscar nome de usuario</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">As miñas historias</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index ad289dd53c..e3beacd662 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">સંપર્કો</string>
   <string name="ContactsCursorLoader_groups">ગ્રુપ</string>
   <string name="ContactsCursorLoader_phone_number_search">ફોન નંબર શોધો</string>
-  <string name="ContactsCursorLoader_username_search">વપરાશકર્તા નામ શોધો</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">વપરાશકર્તા નામ શોધો</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">મારી સ્ટોરી</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ha/strings.xml b/app/src/main/res/values-ha/strings.xml
index c276b746aa..36ef93c610 100644
--- a/app/src/main/res/values-ha/strings.xml
+++ b/app/src/main/res/values-ha/strings.xml
@@ -126,7 +126,7 @@
   <string name="ContactsCursorLoader_contacts">Lambobin sadarwa</string>
   <string name="ContactsCursorLoader_groups">Rukunoni.</string>
   <string name="ContactsCursorLoader_phone_number_search">Binciko lambar waya</string>
-  <string name="ContactsCursorLoader_username_search">Duba sunan maiamfani</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Duba sunan maiamfani</string> -->
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Sako %s</string>
   <string name="ContactsDatabase_signal_call_s">Kiran Signal %s</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index d59e525c5d..e74a903276 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">संपर्क</string>
   <string name="ContactsCursorLoader_groups">समूह </string>
   <string name="ContactsCursorLoader_phone_number_search">फ़ोन नंबर खोजें</string>
-  <string name="ContactsCursorLoader_username_search">उपयोगकर्ता का नाम खोजें</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">उपयोगकर्ता का नाम खोजें</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">मेरी स्टोरीज़</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index c261e06c55..543cf4c67c 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakti</string>
   <string name="ContactsCursorLoader_groups">Grupe</string>
   <string name="ContactsCursorLoader_phone_number_search">Pretraga po broju</string>
-  <string name="ContactsCursorLoader_username_search">Pretraga po korisničkom imenu</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Pretraga po korisničkom imenu</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Moje priče</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index f742c75fc9..cf87300ea1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontaktok</string>
   <string name="ContactsCursorLoader_groups">Csoportok</string>
   <string name="ContactsCursorLoader_phone_number_search">Telefonszám keresés</string>
-  <string name="ContactsCursorLoader_username_search">Felhasználónév keresés</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Felhasználónév keresés</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Történeteim</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 02329e4190..f86351660a 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">Kontak</string>
   <string name="ContactsCursorLoader_groups">Grup</string>
   <string name="ContactsCursorLoader_phone_number_search">Pencarian nomor telepon</string>
-  <string name="ContactsCursorLoader_username_search">Pencarian nama pengguna</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Pencarian nama pengguna</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Cerita saya</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index fb8012b519..09b2bcf7a5 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Tengiliðir</string>
   <string name="ContactsCursorLoader_groups">Hópar</string>
   <string name="ContactsCursorLoader_phone_number_search">Leita að símanúmeri</string>
-  <string name="ContactsCursorLoader_username_search">Leita að notandanafni</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Leita að notandanafni</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Sögurnar mínar</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 048ecdf851..58cf7c504f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Contatti</string>
   <string name="ContactsCursorLoader_groups">Gruppi</string>
   <string name="ContactsCursorLoader_phone_number_search">Ricerca numero di telefono</string>
-  <string name="ContactsCursorLoader_username_search">Ricerca nome utente</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Ricerca nome utente</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Le mie storie</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 8587b8b580..11540ece75 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">אנשי קשר</string>
   <string name="ContactsCursorLoader_groups">קבוצות</string>
   <string name="ContactsCursorLoader_phone_number_search">חיפוש מספר טלפון</string>
-  <string name="ContactsCursorLoader_username_search">חיפוש שם משתמש</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">חיפוש שם משתמש</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">הסיפורים שלי</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8d287c89c9..da9f24d161 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">連絡先</string>
   <string name="ContactsCursorLoader_groups">グループ</string>
   <string name="ContactsCursorLoader_phone_number_search">電話番号検索</string>
-  <string name="ContactsCursorLoader_username_search">ユーザー名検索</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ユーザー名検索</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">マイストーリー</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml
index bfe844f6f6..2bf3450123 100644
--- a/app/src/main/res/values-jv/strings.xml
+++ b/app/src/main/res/values-jv/strings.xml
@@ -123,7 +123,7 @@
   <string name="ContactsCursorLoader_contacts">Kontak</string>
   <string name="ContactsCursorLoader_groups">Grup</string>
   <string name="ContactsCursorLoader_phone_number_search">Padosan nomer telepon</string>
-  <string name="ContactsCursorLoader_username_search">Padosan nami panggina</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Padosan nami panggina</string> -->
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Pesen %s</string>
   <string name="ContactsDatabase_signal_call_s">Telepon Signal %s</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 6cdcf17ad4..6ae126d822 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">კონტაქტები</string>
   <string name="ContactsCursorLoader_groups">ჯგუფები</string>
   <string name="ContactsCursorLoader_phone_number_search">ტელეფონის ნომრის ძიება</string>
-  <string name="ContactsCursorLoader_username_search">მომხმარებლის სახელის ძიება</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">მომხმარებლის სახელის ძიება</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">ჩემი Story-ები</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 0aba6e07f7..ac5c36a2c2 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -144,7 +144,7 @@
   <string name="ContactsCursorLoader_contacts">Inermisen</string>
   <string name="ContactsCursorLoader_groups">Igrawen</string>
   <string name="ContactsCursorLoader_phone_number_search">Anadi n wuṭṭun n tilifun</string>
-  <string name="ContactsCursorLoader_username_search">Anadi n yisem n useqdac</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Anadi n yisem n useqdac</string> -->
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Izen %s</string>
   <string name="ContactsDatabase_signal_call_s">Asiwel Signal %s</string>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 8bf28b1c37..f41b171569 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Байланыстағы тұлғалар</string>
   <string name="ContactsCursorLoader_groups">Топтар</string>
   <string name="ContactsCursorLoader_phone_number_search">Телефон нөмірі бойынша іздеу</string>
-  <string name="ContactsCursorLoader_username_search">Пайдаланушы аты бойынша іздеу</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Пайдаланушы аты бойынша іздеу</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Менің сторилерім</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index fdebc7d4b9..e658900982 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">បញ្ជីទំនាក់ទំនង</string>
   <string name="ContactsCursorLoader_groups">ក្រុម</string>
   <string name="ContactsCursorLoader_phone_number_search">ស្វែងរកលេខទូរស័ព្ទ</string>
-  <string name="ContactsCursorLoader_username_search">ស្វែងរកឈ្មោះអ្នកប្រើប្រាស់</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ស្វែងរកឈ្មោះអ្នកប្រើប្រាស់</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">រឿងរ៉ាវរបស់ខ្ញុំ</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 813ae2d6d2..4fb9431a08 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">ಸಂಪರ್ಕಗಳು</string>
   <string name="ContactsCursorLoader_groups">ಗುಂಪುಗಳು</string>
   <string name="ContactsCursorLoader_phone_number_search">ದೂರವಾಣಿ ಸಂಖ್ಯೆ ಹುಡುಕಾಟ</string>
-  <string name="ContactsCursorLoader_username_search">ಬಳಕೆದಾರಹೆಸರು ಹುಡುಕಾಟ</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ಬಳಕೆದಾರಹೆಸರು ಹುಡುಕಾಟ</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">ನನ್ನ ಸ್ಟೋರೀಸ್</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a64024b4b5..8aa775e7a4 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">연락처</string>
   <string name="ContactsCursorLoader_groups">그룹</string>
   <string name="ContactsCursorLoader_phone_number_search">전화번호 검색</string>
-  <string name="ContactsCursorLoader_username_search">사용자 이름 검색</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">사용자 이름 검색</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">내 스토리</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index cdfd8245b4..6199194348 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -141,7 +141,7 @@
   <string name="ContactsCursorLoader_contacts">Navnivîsk</string>
   <string name="ContactsCursorLoader_groups">Kom</string>
   <string name="ContactsCursorLoader_phone_number_search">Li nimreya telefonê bigere</string>
-  <string name="ContactsCursorLoader_username_search">Li navê bikarhêner bigere</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Li navê bikarhêner bigere</string> -->
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Peyama %s</string>
   <string name="ContactsDatabase_signal_call_s">Gerîna Signalê %s</string>
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index b46e3aae06..ff85826341 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">Байланыштар</string>
   <string name="ContactsCursorLoader_groups">Топтор</string>
   <string name="ContactsCursorLoader_phone_number_search">Телефон номерин издөө</string>
-  <string name="ContactsCursorLoader_username_search">Колдонуучунун аты боюнча издөө</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Колдонуучунун аты боюнча издөө</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Менин окуяларым</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 5f85cd95c0..079acf20a8 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Adresatai</string>
   <string name="ContactsCursorLoader_groups">Grupės</string>
   <string name="ContactsCursorLoader_phone_number_search">Ieškoti telefono numerio</string>
-  <string name="ContactsCursorLoader_username_search">Ieškoti naudotojo vardo</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Ieškoti naudotojo vardo</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mano istorijos</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 8defdd21a0..705f6ba350 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakti</string>
   <string name="ContactsCursorLoader_groups">Grupas</string>
   <string name="ContactsCursorLoader_phone_number_search">Tālruņa numura meklēšana</string>
-  <string name="ContactsCursorLoader_username_search">Lietotājvārda meklēšana</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Lietotājvārda meklēšana</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mani stāsti</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 1d0264639d..036c45cad5 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Контакти</string>
   <string name="ContactsCursorLoader_groups">Групи</string>
   <string name="ContactsCursorLoader_phone_number_search">Пребарување по телефонски број</string>
-  <string name="ContactsCursorLoader_username_search">Пребарување по корисничко име</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Пребарување по корисничко име</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Мои приказни</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 14624ed0b5..029201957f 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">കോൺ‌ടാക്റ്റുകൾ</string>
   <string name="ContactsCursorLoader_groups">ഗ്രൂപ്പുകൾ</string>
   <string name="ContactsCursorLoader_phone_number_search">ഫോൺ നമ്പർ തിരയൽ</string>
-  <string name="ContactsCursorLoader_username_search">ഉപയോക്തൃനാമം തിരയൽ</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ഉപയോക്തൃനാമം തിരയൽ</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">എന്റെ സ്റ്റോറീസ്</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index c3f1c7b3fe..386e01b4bc 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">संपर्क</string>
   <string name="ContactsCursorLoader_groups">गट</string>
   <string name="ContactsCursorLoader_phone_number_search">फोन नंबर शोध</string>
-  <string name="ContactsCursorLoader_username_search">वापरकर्तानाव शोध</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">वापरकर्तानाव शोध</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">माझ्या स्टोरीज</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 68aa81edf6..8a7ee6092d 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">Kenalan</string>
   <string name="ContactsCursorLoader_groups">Kumpulan</string>
   <string name="ContactsCursorLoader_phone_number_search">Pencarian nombor telefon</string>
-  <string name="ContactsCursorLoader_username_search">Pencarian nama pengguna</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Pencarian nama pengguna</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Cerita Saya</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 20bb0f9bdf..57903d99b0 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">အဆက်အသွယ်များ</string>
   <string name="ContactsCursorLoader_groups">အဖွဲ့များ</string>
   <string name="ContactsCursorLoader_phone_number_search">ဖုန်းနံပါတ်ရှာဖွေခြင်း</string>
-  <string name="ContactsCursorLoader_username_search">အသုံးပြုသူအမည်ရှာဖွေခြင်း</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">အသုံးပြုသူအမည်ရှာဖွေခြင်း</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">ကျွန်ုပ်၏ စတိုရီများ</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 8f0d929dce..aa64ee417d 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakter</string>
   <string name="ContactsCursorLoader_groups">Grupper</string>
   <string name="ContactsCursorLoader_phone_number_search">Telefonnummer søk</string>
-  <string name="ContactsCursorLoader_username_search">Brukernavn søk</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Brukernavn søk</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mine stories</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 677254758d..de9237bced 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -169,7 +169,7 @@ Geblokkeerde personen kunnen in groepsgesprekken de berichten die jij stuurt nie
   <string name="ContactsCursorLoader_contacts">Contacten</string>
   <string name="ContactsCursorLoader_groups">Groepen</string>
   <string name="ContactsCursorLoader_phone_number_search">Zoeken op telefoonnummer</string>
-  <string name="ContactsCursorLoader_username_search">Zoeken op gebruikersnaam</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Zoeken op gebruikersnaam</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mijn verhalen</string>
   <!--Action for creating a new story-->
@@ -750,9 +750,9 @@ Geblokkeerde personen kunnen in groepsgesprekken de berichten die jij stuurt nie
   <string name="ManageProfileFragment_badges">Badges</string>
   <string name="ManageProfileFragment__edit_photo">Profielfoto aanpassen</string>
   <!--Snackbar message after creating username-->
-  <string name="ManageProfileFragment__username_created">Gebruikersnaam gecreëerd. </string>
+  <string name="ManageProfileFragment__username_created">Gebruikersnaam gecreëerd.</string>
   <!--Snackbar message after copying username-->
-  <string name="ManageProfileFragment__username_copied">Gebruikersnaam gekopieerd. </string>
+  <string name="ManageProfileFragment__username_copied">Gebruikersnaam gekopieerd.</string>
   <!--ManageRecipientActivity-->
   <string name="ManageRecipientActivity_no_groups_in_common">Geen gemeenschappelijke groepen</string>
   <plurals name="ManageRecipientActivity_d_groups_in_common">
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 19f9df7ef0..30af8faddb 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontaktar</string>
   <string name="ContactsCursorLoader_groups">Grupper</string>
   <string name="ContactsCursorLoader_phone_number_search">Søk etter telefonnummer</string>
-  <string name="ContactsCursorLoader_username_search">Søk etter brukarnamn</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Søk etter brukarnamn</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mine historier</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index 4d17b200a1..83a2554343 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -145,7 +145,7 @@
   <string name="ContactsCursorLoader_contacts">ଯୋଗାଯୋଗ</string>
   <string name="ContactsCursorLoader_groups">ଗୋଷ୍ଠୀଗୁଡ଼ିକ</string>
   <string name="ContactsCursorLoader_phone_number_search">ଫୋନ୍ ନମ୍ବର୍ ସନ୍ଧାନ</string>
-  <string name="ContactsCursorLoader_username_search">ଉପଭୋକ୍ତା ନାମ ସନ୍ଧାନ</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ଉପଭୋକ୍ତା ନାମ ସନ୍ଧାନ</string> -->
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">ବାର୍ତ୍ତା %s</string>
   <string name="ContactsDatabase_signal_call_s">Signal କଲ୍ କରନ୍ତୁ %s</string>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 04ffc47e49..8b68b084f1 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -129,7 +129,7 @@
   <string name="ContactsCursorLoader_contacts">رابطے</string>
   <string name="ContactsCursorLoader_groups">گروپس</string>
   <string name="ContactsCursorLoader_phone_number_search">فون نمبر لبھنا</string>
-  <string name="ContactsCursorLoader_username_search">صارف ناں دی تلاش</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">صارف ناں دی تلاش</string> -->
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s"> سنیہا %s</string>
   <string name="ContactsDatabase_signal_call_s"> Signal کال %s</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 82c14d5eb9..d10a92ff26 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">ਸੰਪਰਕ</string>
   <string name="ContactsCursorLoader_groups">ਗਰੁੱਪ</string>
   <string name="ContactsCursorLoader_phone_number_search">ਫੋਨ ਨੰਬਰ ਖੋਜੋ</string>
-  <string name="ContactsCursorLoader_username_search">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਖੋਜੋ</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਖੋਜੋ</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">ਮੇਰੀਆਂ ਕਹਾਣੀਆਂ</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 02cbea239c..7c9dc487f1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakty</string>
   <string name="ContactsCursorLoader_groups">Grupy</string>
   <string name="ContactsCursorLoader_phone_number_search">Znajdź numer telefonu</string>
-  <string name="ContactsCursorLoader_username_search">Znajdź użytkownika</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Znajdź użytkownika</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Moje historie</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index de2967a751..2d82436c14 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -161,7 +161,7 @@
   <string name="ContactsCursorLoader_contacts">مخاطبین</string>
   <string name="ContactsCursorLoader_groups">ګروپونه </string>
   <string name="ContactsCursorLoader_phone_number_search">د موبایل شمېرې پلټنه</string>
-  <string name="ContactsCursorLoader_username_search">د کارن د نوم پلټنه</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">د کارن د نوم پلټنه</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <!--Action for creating a new story-->
   <!--ContactsDatabase-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 87b6d9c0f4..78684a096b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Contatos</string>
   <string name="ContactsCursorLoader_groups">Grupos</string>
   <string name="ContactsCursorLoader_phone_number_search">Pesquisa por número de telefone</string>
-  <string name="ContactsCursorLoader_username_search">Pesquisa por usuário</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Pesquisa por usuário</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Meus Stories</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a26c645ab2..dc96eb9df4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Contactos</string>
   <string name="ContactsCursorLoader_groups">Grupos</string>
   <string name="ContactsCursorLoader_phone_number_search">Procurar número de telefone</string>
-  <string name="ContactsCursorLoader_username_search">Procurar nome de utilizador</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Procurar nome de utilizador</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">As minhas histórias</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 677d691be0..2ea71c52fe 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Contacte</string>
   <string name="ContactsCursorLoader_groups">Grupuri</string>
   <string name="ContactsCursorLoader_phone_number_search">Căutare număr de telefon</string>
-  <string name="ContactsCursorLoader_username_search">Căutare nume de utilizator</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Căutare nume de utilizator</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Poveștile Mele</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1899c1d76c..baceb10751 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Контакты</string>
   <string name="ContactsCursorLoader_groups">Группы</string>
   <string name="ContactsCursorLoader_phone_number_search">Поиск по номеру телефона</string>
-  <string name="ContactsCursorLoader_username_search">Поиск по имени пользователя</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Поиск по имени пользователя</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Мои истории</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index f6e968ec22..133f5a72c3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakty</string>
   <string name="ContactsCursorLoader_groups">Skupiny</string>
   <string name="ContactsCursorLoader_phone_number_search">Vyhľadávanie telefónneho čísla</string>
-  <string name="ContactsCursorLoader_username_search">Vyhľadávanie používateľského mena</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Vyhľadávanie používateľského mena</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Moje príbehy</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index dbc8d51f94..a395302917 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Stiki</string>
   <string name="ContactsCursorLoader_groups">Skupine</string>
   <string name="ContactsCursorLoader_phone_number_search">Iskanje po telefonskih številkah</string>
-  <string name="ContactsCursorLoader_username_search">Iskanje po uporabniških imenih</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Iskanje po uporabniških imenih</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Moje zgodbe</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 1846c18c4e..cf5ee3a807 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontaktet</string>
   <string name="ContactsCursorLoader_groups">Grupet</string>
   <string name="ContactsCursorLoader_phone_number_search">Kërkimi i numrit të telefonit</string>
-  <string name="ContactsCursorLoader_username_search">Kërkim i emrit të përdoruesit</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Kërkim i emrit të përdoruesit</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Story-t e mia</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 22257c7a49..63598426be 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -168,7 +168,7 @@
   <string name="ContactsCursorLoader_contacts">Контакти</string>
   <string name="ContactsCursorLoader_groups">Групе</string>
   <string name="ContactsCursorLoader_phone_number_search">Претрага броја телефона</string>
-  <string name="ContactsCursorLoader_username_search">Претрага корисничког имена</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Претрага корисничког имена</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Моје приче</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a3258c52d1..59099829f0 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kontakter</string>
   <string name="ContactsCursorLoader_groups">Grupper</string>
   <string name="ContactsCursorLoader_phone_number_search">Telefonnummer-sökning</string>
-  <string name="ContactsCursorLoader_username_search">Användarnamn-sökning</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Användarnamn-sökning</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Mina berättelser</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index a9beaa9b0e..ef610ff043 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Mawasiliano</string>
   <string name="ContactsCursorLoader_groups">Makundi</string>
   <string name="ContactsCursorLoader_phone_number_search">Utafutaji wa nambari ya simu</string>
-  <string name="ContactsCursorLoader_username_search">Utafutaji wa jina la mtumizi</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Utafutaji wa jina la mtumizi</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Stori Zangu</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 8b8de7894b..8406531e40 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">தொடர்புகள்</string>
   <string name="ContactsCursorLoader_groups">குழுக்கள்</string>
   <string name="ContactsCursorLoader_phone_number_search">தொலைபேசி எண் தேடல்</string>
-  <string name="ContactsCursorLoader_username_search">பயனர்பெயர் தேடல்</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">பயனர்பெயர் தேடல்</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">எனது ஸ்டோரீஸ்</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index f4c975e10b..ee18561000 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">కాంటాక్ట్స్</string>
   <string name="ContactsCursorLoader_groups">సమూహాలు</string>
   <string name="ContactsCursorLoader_phone_number_search">ఫోన్ నంబర్ శోధన</string>
-  <string name="ContactsCursorLoader_username_search">వినియోగదారు పేరు శోధన</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">వినియోగదారు పేరు శోధన</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">నా స్టోరీలు</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index de6d5cf590..b7149877cb 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">ผู้ติดต่อ</string>
   <string name="ContactsCursorLoader_groups">กลุ่ม</string>
   <string name="ContactsCursorLoader_phone_number_search">ค้นด้วยหมายเลขโทรศัพท์</string>
-  <string name="ContactsCursorLoader_username_search">ค้นหาด้วยชื่อผู้ใช้</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ค้นหาด้วยชื่อผู้ใช้</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">สตอรี่ของฉัน</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 0d85f5a96d..0e7623237f 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Mga Kontak</string>
   <string name="ContactsCursorLoader_groups">Mga Grupo</string>
   <string name="ContactsCursorLoader_phone_number_search">Maghanap ng numero ng telepono</string>
-  <string name="ContactsCursorLoader_username_search">Maghanap ng Username</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Maghanap ng Username</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Stories Ko</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 747fedb357..74aef5d5fd 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">Kişiler</string>
   <string name="ContactsCursorLoader_groups">Gruplar</string>
   <string name="ContactsCursorLoader_phone_number_search">Telefon numarasıyla arama</string>
-  <string name="ContactsCursorLoader_username_search">Kullanıcı adıyla arama</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Kullanıcı adıyla arama</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Hikayelerim</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 5c2c22258a..ea81ae3a75 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -164,7 +164,7 @@
   <string name="ContactsCursorLoader_contacts">ئالاقەداشلار</string>
   <string name="ContactsCursorLoader_groups">گۇرۇپپا</string>
   <string name="ContactsCursorLoader_phone_number_search">تېلېفون نومۇر ئىزدەش</string>
-  <string name="ContactsCursorLoader_username_search">ئىشلەتكۈچى ئىسمى  ئىزدەش</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">ئىشلەتكۈچى ئىسمى  ئىزدەش</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <!--Action for creating a new story-->
   <!--ContactsDatabase-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5135ca3c7b..69a993be57 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -169,7 +169,7 @@
   <string name="ContactsCursorLoader_contacts">Контакти</string>
   <string name="ContactsCursorLoader_groups">Групи</string>
   <string name="ContactsCursorLoader_phone_number_search">Пошук за номером</string>
-  <string name="ContactsCursorLoader_username_search">Пошук за іменем користувача</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Пошук за іменем користувача</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Мої історії</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 5620bbcb50..8e0c81fd2e 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -167,7 +167,7 @@
   <string name="ContactsCursorLoader_contacts">رابطے</string>
   <string name="ContactsCursorLoader_groups">گروپس</string>
   <string name="ContactsCursorLoader_phone_number_search">فون نمبر تلاش کریں</string>
-  <string name="ContactsCursorLoader_username_search">صارف کا نام تلاش کریں</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">صارف کا نام تلاش کریں</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">میری اسٹوریز</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 0fea2cc6ec..40ea3c2f60 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">Danh bạ</string>
   <string name="ContactsCursorLoader_groups">Nhóm</string>
   <string name="ContactsCursorLoader_phone_number_search">Tìm kiếm số điện thoại</string>
-  <string name="ContactsCursorLoader_username_search">Tìm kiếm tên người dùng</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">Tìm kiếm tên người dùng</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">Các Story của tôi</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index 26da7d4b4e..03463ea98c 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">聯絡人</string>
   <string name="ContactsCursorLoader_groups">谷</string>
   <string name="ContactsCursorLoader_phone_number_search">查電話冧把</string>
-  <string name="ContactsCursorLoader_username_search">查使用者名稱</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">查使用者名稱</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">我嘅是日花生</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1ade8abacf..04030bed40 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">联系人</string>
   <string name="ContactsCursorLoader_groups">群组</string>
   <string name="ContactsCursorLoader_phone_number_search">手机号码搜索</string>
-  <string name="ContactsCursorLoader_username_search">用户名搜索</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">用户名搜索</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">我的动态</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index b8c39f0cac..28d32b5eda 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">聯絡人</string>
   <string name="ContactsCursorLoader_groups">群組</string>
   <string name="ContactsCursorLoader_phone_number_search">搜尋電話號碼</string>
-  <string name="ContactsCursorLoader_username_search">搜尋使用者名稱</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">搜尋使用者名稱</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">我的限時動態</string>
   <!--Action for creating a new story-->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8890438c66..5d85d2ea1f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -166,7 +166,7 @@
   <string name="ContactsCursorLoader_contacts">聯絡人</string>
   <string name="ContactsCursorLoader_groups">群組</string>
   <string name="ContactsCursorLoader_phone_number_search">搜尋電話號碼</string>
-  <string name="ContactsCursorLoader_username_search">搜尋使用者名稱</string>
+  <!-- Removed by excludeNonTranslatables <string name="ContactsCursorLoader_username_search">搜尋使用者名稱</string> -->
   <!--Label for my stories when selecting who to send media to-->
   <string name="ContactsCursorLoader_my_stories">我的限時動態</string>
   <!--Action for creating a new story-->
diff --git a/app/static-ips.gradle b/app/static-ips.gradle
index 71fa5b9778..3fc89f0825 100644
--- a/app/static-ips.gradle
+++ b/app/static-ips.gradle
@@ -1,5 +1,5 @@
 ext.service_ips='new String[]{"13.248.212.111","76.223.92.165"}'
-ext.storage_ips='new String[]{"142.250.81.243"}'
+ext.storage_ips='new String[]{"142.251.40.147"}'
 ext.cdn_ips='new String[]{"99.84.37.46","99.84.37.63","99.84.37.78","99.84.37.83"}'
 ext.cdn2_ips='new String[]{"104.18.33.175","172.64.154.81"}'
 ext.cds_ips='new String[]{"20.73.137.187"}'