diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
index 062289688..c70236e07 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="top|left"
-        android:hint="@string/hint_keybase_search"
+        android:hint="@string/hint_keybase_search_hint"
         android:imeOptions="actionSearch"
         android:inputType="textNoSuggestions"
         android:singleLine="true"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
index fde90b81f..62e7d740c 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="top|left"
-            android:hint="@string/hint_public_keys"
+            android:hint="@string/hint_keyserver_search_hint"
             android:imeOptions="actionSearch"
             android:inputType="textNoSuggestions"
             android:singleLine="true"
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 19e94b4b8..dd4d41650 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -184,7 +184,7 @@
   <string name="progress_verifying_integrity">verifikuji integritu...</string>
   <string name="progress_deleting_securely">mažu \'%s\' bezpečně...</string>
   <!--action strings-->
-  <string name="hint_public_keys">Jméno/Email/ID klíče</string>
+  <string name="hint_keyserver_search_hint">Jméno/Email/ID klíče</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index a843a154a..74282fd29 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -270,8 +270,8 @@
   <string name="progress_verifying_integrity">Integrität wird überprüft…</string>
   <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht…</string>
   <!--action strings-->
-  <string name="hint_public_keys">Name/Email/Schlüssel ID...</string>
-  <string name="hint_keybase_search">Name/Keybase.io Benutzername...</string>
+  <string name="hint_keyserver_search_hint">Name/Email/Schlüssel ID...</string>
+  <string name="hint_keybase_search_hint">Name/Keybase.io Benutzername...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 80c2060d1..8b8af788d 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -276,8 +276,8 @@
   <string name="progress_verifying_integrity">verificando la integridad...</string>
   <string name="progress_deleting_securely">borrando \'%s\' de forma segura…</string>
   <!--action strings-->
-  <string name="hint_public_keys">Identidad de Nombre/Correo/Clave...</string>
-  <string name="hint_keybase_search">Nombre de usuario de Nombre/Keybase.io...</string>
+  <string name="hint_keyserver_search_hint">Identidad de Nombre/Correo/Clave...</string>
+  <string name="hint_keybase_search_hint">Nombre de usuario de Nombre/Keybase.io...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index e30ebb883..35e4c5766 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -276,8 +276,8 @@
   <string name="progress_verifying_integrity">vérification de l\'intégrité...</string>
   <string name="progress_deleting_securely">suppression sûre de « %s »...</string>
   <!--action strings-->
-  <string name="hint_public_keys">Nom/courriel/ ID clef...</string>
-  <string name="hint_keybase_search">Nom/nom d\'utilisateur keybase.io...</string>
+  <string name="hint_keyserver_search_hint">Nom/courriel/ ID clef...</string>
+  <string name="hint_keybase_search_hint">Nom/nom d\'utilisateur keybase.io...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 89e09783b..2a5131bcf 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -236,8 +236,8 @@
   <string name="progress_verifying_integrity">verifica integrita\'...</string>
   <string name="progress_deleting_securely">eliminazione sicura di \'%s\'...</string>
   <!--action strings-->
-  <string name="hint_public_keys">Nome/Email/ID Chiave...</string>
-  <string name="hint_keybase_search">Nome/Keybase.io nome utente...</string>
+  <string name="hint_keyserver_search_hint">Nome/Email/ID Chiave...</string>
+  <string name="hint_keybase_search_hint">Nome/Keybase.io nome utente...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index dbb52d208..f0cb9d47b 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -271,8 +271,8 @@
   <string name="progress_verifying_integrity">完全性の検証中...</string>
   <string name="progress_deleting_securely">\'%s\' を完全に削除中…</string>
   <!--action strings-->
-  <string name="hint_public_keys">名前/メール/鍵ID...</string>
-  <string name="hint_keybase_search">名前/Keybase.io名...</string>
+  <string name="hint_keyserver_search_hint">名前/メール/鍵ID...</string>
+  <string name="hint_keybase_search_hint">名前/Keybase.io名...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index fd2c0312d..4f32bea3a 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -238,7 +238,7 @@
   <string name="progress_verifying_integrity">проверка целостности...</string>
   <string name="progress_deleting_securely">безопасное удаление \'%s\'...</string>
   <!--action strings-->
-  <string name="hint_public_keys">Имя/Email/ID ключа…</string>
+  <string name="hint_keyserver_search_hint">Имя/Email/ID ключа…</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 0a7b4713e..0de5e97ea 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -243,8 +243,8 @@
   <string name="progress_verifying_integrity">preverjam neokrnjenost...</string>
   <string name="progress_deleting_securely">varno brišem \'%s\'…</string>
   <!--action strings-->
-  <string name="hint_public_keys">Ime/e-pošta/ID ključa</string>
-  <string name="hint_keybase_search">Ime/Keybase.io uporabniško ime...</string>
+  <string name="hint_keyserver_search_hint">Ime/e-pošta/ID ključa</string>
+  <string name="hint_keybase_search_hint">Ime/Keybase.io uporabniško ime...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 42ac94c32..7a4c79ddb 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -238,7 +238,7 @@
   <string name="progress_verifying_integrity">перевірка цілісності…</string>
   <string name="progress_deleting_securely">вилучення безпечно \'%s\'…</string>
   <!--action strings-->
-  <string name="hint_public_keys">Назва/Ел. пошта/ІД ключа…</string>
+  <string name="hint_keyserver_search_hint">Назва/Ел. пошта/ІД ключа…</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d491723fd..20a149956 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -303,8 +303,8 @@
     <string name="progress_deleting_securely">deleting \'%s\' securely…</string>
 
     <!-- action strings -->
-    <string name="hint_public_keys">Name/Email/Key ID…</string>
-    <string name="hint_keybase_search">Name/Keybase.io username…</string>
+    <string name="hint_keyserver_search_hint">Name/Email/Key ID…</string>
+    <string name="hint_keybase_search_hint">Name/Email/Proof/Key…</string>
 
     <!-- key bit length selections -->
     <string name="key_size_512">512</string>