diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 172e8949..661ac502 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2,14 +2,12 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
 
     <string name="action_settings">الإعدادات</string>
     <string name="dialog_delete_title">إنّ المجلد موجود</string>
     <string name="dialog_delete">حذف المجلد</string>
     <string name="dialog_do_not_delete">إلغاء</string>
     <string name="title_activity_git_clone">معلومات حول المستودع</string>
-    <string name="store_git">/store/.git</string>
     <string name="delete_dialog_text">هل تود حقًا حذف كلمة السر "/</string>
     <string name="move">نقل</string>
     <string name="edit">تعديل</string>
@@ -38,7 +36,6 @@
     <string name="server_name">الخادوم</string>
     <string name="server_protocol">البروتوكول</string>
     <string name="server_url">عنوان الخادوم</string>
-    <string name="server_url_hint">server.com</string>
     <string name="server_port_hint">22</string>
     <string name="default_ssh_port">22</string>
     <string name="default_https_port">443</string>
@@ -65,7 +62,6 @@
     <string name="password">كلمة السر :</string>
     <string name="extra_content">بيانات إضافية :</string>
     <string name="username">إسم المستخدم :</string>
-    <string name="otp">OTP :</string>
     <string name="edit_password">تعديل كلمة السر</string>
     <string name="copy_password">نسخ كلمة السر</string>
     <string name="copy_username">نسخ إسم المستخدم</string>
@@ -147,5 +143,4 @@
     <string name="autofill_pick_and_match">إختر و طابق مع ...</string>
     <string name="autofill_paste">إلصاق</string>
     <string name="new_password_title">كلمة السر الجديدة</string>
-    <string name="crypto_password_edit_hint">p@ssw0rd!</string>
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b9fba7ef..72795318 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
 
     <string name="action_settings">Nastavení</string>
     <string name="dialog_delete_title">Adresář již existuje</string>
@@ -10,10 +9,9 @@
     <string name="dialog_delete">Smazat adresář</string>
     <string name="dialog_do_not_delete">Zrušit</string>
     <string name="title_activity_git_clone">Informace repozitáře</string>
-    
+
     <!-- Password Store -->
     <string name="creation_dialog_text">Naklonujte nebo vytvořte nový repozitář před pokusem přidat heslo nebo spustit synchronizaci.</string>
-	<string name="store_git">/store/.git</string>
     <string name="key_dialog_text">Před inicializací repozitáře je třeba vybrat "ID PGP klíče"</string>
     <string name="delete_dialog_text">Opravdu chcete smazat heslo /"</string>
 
@@ -40,7 +38,7 @@
     <string name="passphrase_dialog_title">Ověření</string>
     <string name="passphrase_dialog_text">Zadejte prosím heslo pro svůj SSH klíč. Nechte prázdné pokud je bez hesla.</string>
     <string name="password_dialog_text">Zadejte prosím heslo k tomuto repozitáři</string>
-    
+
     <!-- Clone fragment -->
     <string name="clone">Klonovat ze serveru</string>
     <string name="initialize">Použít místní adresář</string>
@@ -48,7 +46,6 @@
     <string name="server_name">Server</string>
     <string name="server_protocol">Protokol</string>
     <string name="server_url">URL serveru</string>
-    <string name="server_url_hint">server.com</string>
     <string name="server_port_hint">22</string>
     <string name="default_ssh_port">22</string>
     <string name="default_https_port">443</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c60da262..c474d86f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
 
     <string name="action_settings">Einstellungen</string>
     <string name="dialog_delete_title">Ordner existiert bereits</string>
@@ -10,10 +9,9 @@
     <string name="dialog_delete">Ordner löschen</string>
     <string name="dialog_do_not_delete">Abbruch</string>
     <string name="title_activity_git_clone">Repository Informationen</string>
-    
+
     <!-- Password Store -->
     <string name="creation_dialog_text">Bitte klone oder erstelle ein neues Repository, bevor du versuchst ein Passwort hinzuzufügen oder jegliche Synchronisation-Operation durchführst.</string>
-	<string name="store_git">/store/.git</string>
     <string name="key_dialog_text">Du musst deine PGP-Key ID auwählen, bevor das Repository intialisiert wird.</string>
     <string name="delete_dialog_text">Bist du dir sicher, dass du das Passwort löschen möchtest \"</string>
     <string name="move">Verschieben</string>
@@ -45,7 +43,7 @@
     <string name="passphrase_dialog_text">Bitte setze ein Passwort für deinen SSH-Key. Lasse das Feld leer, wenn kein Passwort vergeben werden soll.</string>
     <string name="password_dialog_text">Bitte setze ein Passwort für dieses Repository</string>
     <string name="clone_button">Klone!</string>
-    
+
     <!-- Clone fragment -->
     <string name="clone">Klone von Server</string>
     <string name="initialize">Nutze lokalen Ordner</string>
@@ -53,7 +51,6 @@
     <string name="server_name">Server</string>
     <string name="server_protocol">Protokoll</string>
     <string name="server_url">Server URL</string>
-    <string name="server_url_hint">server.com</string>
     <string name="server_port_hint">22</string>
     <string name="default_ssh_port">22</string>
     <string name="default_https_port">443</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 66be6d70..4bbb6d66 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
 
     <string name="action_settings">Ajustes</string>
     <string name="dialog_delete_title">El directorio ya existe</string>
@@ -13,7 +12,6 @@
 
     <!-- Password Store -->
     <string name="creation_dialog_text">Por favor clona o crea un nuevo repositorio antes de añadir una contraseña o ejecutar una operación de sincronización.</string>
-    <string name="store_git">/store/.git</string>
     <string name="key_dialog_text">Tienes que seleccionar una llave PGP antes de inicializar el repositorio</string>
     <string name="delete_dialog_text">Confirma que deseas eliminar la contraseña /"</string>
     <string name="move">Mover</string>
@@ -97,7 +95,6 @@
     <string name="password">Contraseña:</string>
     <string name="extra_content">Contenido extra:</string>
     <string name="username">Nombre de usuario:</string>
-    <string name="otp">OTP:</string>
     <string name="edit_password">Editar contraseña</string>
     <string name="copy_password">Copiar contraseña</string>
     <string name="copy_username">Copiar nombre de usuario</string>
@@ -232,7 +229,6 @@
     <string name="hackish_tools">Hackish tools</string>
     <string name="abort_rebase">Abortar rebase</string>
     <string name="commit_hash">Hash del commit</string>
-    <string name="crypto_password_edit_hint">p@ssw0rd!</string>
     <string name="crypto_extra_edit_hint">Username: Nombre de usuario\n… o algún contenido extra</string>
     <string name="get_last_changed_failed">Error al obtener la fecha de último cambio</string>
     <string name="hotp_pending">Presiona copiar para calcular el HOTP</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 00aadc80..dfb9b831 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
 
     <string name="action_settings">Paramètres</string>
     <string name="dialog_delete_title">Répertoire déjà existant</string>
@@ -10,10 +9,9 @@
     <string name="dialog_delete">Suprimer le répertoire</string>
     <string name="dialog_do_not_delete">Annuler</string>
     <string name="title_activity_git_clone">Information sur le dépôt Git</string>
-    
+
     <!-- Password Store -->
     <string name="creation_dialog_text">Clonez ou créez un dépôt suivant avant d\'essayer d\'ajouter un mot de pass ou d\'effectuer une opération de synchornisation.</string>
-	<string name="store_git">/store/.git</string>
     <string name="key_dialog_text">Vous devez sélectionner votre "PGP-Key ID" avant d\'initialiser le dépôt</string>
     <string name="delete_dialog_text">Êtes-vous sûr de vouloir supprimer le mot de passe /"</string>
 
@@ -42,7 +40,7 @@
     <string name="passphrase_dialog_title">Authentification</string>
     <string name="passphrase_dialog_text">Saisissez le mot de passe associé à pour votre clef SSH. Laisser vide si il n\'y a pas de mot de passe.</string>
     <string name="password_dialog_text">Renseignez le mot de passe pour ce dépôt</string>
-    
+
     <!-- Clone fragment -->
     <string name="clone">Cloner depuis le serveur</string>
     <string name="initialize">Utiliser un répertoire local</string>
@@ -50,7 +48,6 @@
     <string name="server_name">Serveur</string>
     <string name="server_protocol">Protocole</string>
     <string name="server_url">URL du serveur</string>
-    <string name="server_url_hint">server.com</string>
     <string name="server_port_hint">22</string>
     <string name="default_ssh_port">22</string>
     <string name="default_https_port">443</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b5c19706..cb7b249f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
 
     <string name="action_settings">設定</string>
     <string name="dialog_delete_title">ディレクトリーはすでに存在します</string>
@@ -10,10 +9,9 @@
     <string name="dialog_delete">ディレクトリーを削除</string>
     <string name="dialog_do_not_delete">キャンセル</string>
     <string name="title_activity_git_clone">リポジトリ情報</string>
-    
+
     <!-- Password Store -->
     <string name="creation_dialog_text">パスワードや同期操作を追加する前に、以下の新しいリポジトリをクローンまたは作成してください。</string>
-	<string name="store_git">/store/.git</string>
     <string name="key_dialog_text">リポジトリを初期化する前に "PGP 鍵 ID"を選択する必要があります</string>
     <string name="delete_dialog_text">パスワードを削除してもよろしいですか /"</string>
 
@@ -42,7 +40,7 @@
     <string name="passphrase_dialog_title">認証</string>
     <string name="passphrase_dialog_text">SSH 鍵のパスフレーズを入力してください。 パスフレーズがない場合は空のままにします。</string>
     <string name="password_dialog_text">このリポジトリのパスワードを入力してください</string>
-    
+
     <!-- Clone fragment -->
     <string name="clone">サーバーからクローン</string>
     <string name="initialize">ローカルディレクトリーを使用する</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e0214ea3..da8b8e54 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
 
     <string name="action_settings">Настройки</string>
     <string name="dialog_delete_title">Директория уже существует</string>
@@ -13,7 +12,6 @@
 
     <!-- Password Store -->
     <string name="creation_dialog_text">Пожалуйста, клонируйте или создайте новый репозиторий перед тем, как добавлять пароль или выполнять синхронизацию.</string>
-    <string name="store_git">/store/.git</string>
     <string name="key_dialog_text">Вы должны выбрать PGP ключ перед инициализацией хранилища</string>
     <string name="delete_dialog_text">Вы уверены что хотите удалить пароль /"</string>
     <string name="move">Переместить</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e0b2a54d..fb3f324f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Password Store</string>
     <string name="action_search">搜索</string>
     <string name="action_settings">设置</string>
     <string name="autofill_apps_default">使用默认设置</string>
@@ -92,7 +91,6 @@
     <string name="server_port_hint">22</string>
     <string name="server_protocol">接口</string>
     <string name="server_url">服务器 URL</string>
-    <string name="server_url_hint">server.com</string>
     <string name="server_user">用户名</string>
     <string name="server_user_hint">git_username</string>
     <string name="set_information_dialog_text">你必须在与服务器同步前设置服务器信息</string>
@@ -113,7 +111,6 @@
     <string name="ssh_preferences_dialog_import">导入</string>
     <string name="ssh_preferences_dialog_text">请在设置中导入或生成你的SSH密钥文件</string>
     <string name="ssh_preferences_dialog_title">无SSH密钥</string>
-    <string name="store_git">/store/.git</string>
     <string name="title_activity_git_clone">Repo 信息</string>
     <string name="warn_malformed_url_port">如果使用自定义端口, 请提供绝对路径 (从根目录开始)</string>
     <string name="dialog_positive">现在就去</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3a9fca05..0dda8592 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Password Store</string>
     <string name="action_search">搜尋</string>
     <string name="action_settings">設定</string>
     <string name="autofill_apps_default">使用預設值</string>
@@ -90,7 +89,6 @@
     <string name="server_port_hint">22</string>
     <string name="server_protocol">port</string>
     <string name="server_url">伺服器 URL</string>
-    <string name="server_url_hint">server.com</string>
     <string name="server_user">使用者名稱</string>
     <string name="server_user_hint">git_username</string>
     <string name="set_information_dialog_text">你必須在與伺服器同步前設定伺服器資訊</string>
@@ -111,7 +109,6 @@
     <string name="ssh_preferences_dialog_import">匯入</string>
     <string name="ssh_preferences_dialog_text">請在設定中匯入或產生你的 SSH 金鑰</string>
     <string name="ssh_preferences_dialog_title">無 SSH 金鑰</string>
-    <string name="store_git">/store/.git</string>
     <string name="title_activity_git_clone">Repo 訊息</string>
     <string name="warn_malformed_url_port">如果使用自定 port, 請使用绝對路徑 (從根目錄開始)</string>
     <string name="dialog_positive">確定</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f229f1d..c43ee704 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <!-- Activity names -->
-    <string name="app_name">Password Store</string>
+    <string name="app_name" translatable="false">Password Store</string>
 
     <string name="action_settings">Settings</string>
     <string name="dialog_delete_title">Directory already exist</string>
@@ -14,7 +14,6 @@
 
     <!-- Password Store -->
     <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string>
-    <string name="store_git">/store/.git</string>
     <string name="key_dialog_text">You have to select your "PGP-Key ID" before initializing the repository</string>
     <string name="delete_dialog_text">Are you sure you want to delete the password /"</string>
     <string name="move">Move</string>
@@ -73,7 +72,7 @@
     <string name="server_name">Server</string>
     <string name="server_protocol">Protocol</string>
     <string name="server_url">Server URL</string>
-    <string name="server_url_hint">server.com</string>
+    <string name="server_url_hint" translatable="false">server.com</string>
     <string name="server_port_hint">22</string>
     <string name="default_ssh_port">22</string>
     <string name="default_https_port">443</string>
@@ -90,9 +89,9 @@
     <!-- Git Config fragment -->
     <string name="git_config" translatable="false">Git config</string>
     <string name="git_user_name" translatable="false">Username</string>
-    <string name="git_user_name_hint" translatable="false">User name</string>
-    <string name="git_user_email" translatable="false">Email</string>
-    <string name="git_user_email_hint" translatable="false">email</string>
+    <string name="git_user_name_hint">User name</string>
+    <string name="git_user_email">Email</string>
+    <string name="git_user_email_hint">email</string>
     <string name="invalid_email_dialog_text">Please enter a valid email address</string>
     <string name="clone_button">Clone!</string>
 
@@ -109,7 +108,7 @@
     <string name="password">Password:</string>
     <string name="extra_content">Extra content:</string>
     <string name="username">Username:</string>
-    <string name="otp">OTP:</string>
+    <string name="otp" translatable="false">OTP:</string>
     <string name="edit_password">Edit password</string>
     <string name="copy_password">Copy password</string>
     <string name="copy_username">Copy username</string>
@@ -245,7 +244,7 @@
     <string name="hackish_tools">Hackish tools</string>
     <string name="abort_rebase">Abort rebase</string>
     <string name="commit_hash">Commit hash</string>
-    <string name="crypto_password_edit_hint">p@ssw0rd!</string>
+    <string name="crypto_password_edit_hint" translatable="false">p@ssw0rd!</string>
     <string name="crypto_extra_edit_hint">username: something other extra content</string>
     <string name="get_last_changed_failed">Failed to get last changed date</string>
     <string name="hotp_pending">Tap copy to calculate HOTP</string>