diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 5997e3253..1ed691110 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -8,7 +8,6 @@
   <string name="delete_file_f">Odstranit soubor</string>
   <string name="delete_dir">Odstranit složku</string>
   <string name="passwd_hint">Heslo</string>
-  <string name="login">Přihlásit</string>
   <string name="open_file">Otevřít</string>
   <string name="download_file">Stáhnout</string>
   <string name="redownload_file">Stáhnout znovu</string>
@@ -274,4 +273,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dcf7e81b4..aee59c1f3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">Datei löschen</string>
   <string name="delete_dir">Ordner löschen</string>
   <string name="server_hint">Server, z.B. cloud.seafile.com</string>
-  <string name="email_hint">Benutzername oder E-Mail-Adresse</string>
   <string name="passwd_hint">Passwort</string>
-  <string name="login">Anmelden</string>
   <string name="open_file">Öffnen</string>
   <string name="download_file">Herunterladen</string>
   <string name="redownload_file">Erneut herunterladen</string>
@@ -36,6 +34,11 @@
     <item>Andere</item>
   </string-array>
   <string name="choose_server">Bitte wählen Sie einen Seafile-Server aus</string>
+  <string-array name="choose_server_array">
+    <item>SeaCloud.cc</item>
+    <item>Shibboleth-Login</item>
+    <item>Anderer Seafile-Server</item>
+  </string-array>
   <string name="network_down">Keine Netzwerkverbindung</string>
   <string name="unknow_error">Unbekannter Fehler</string>
   <string name="invalid_server_address">Ungültige Serveradresse</string>
@@ -177,6 +180,7 @@ Zum Aktualisieren einmal antippen</string>
   <string name="seconds_ago">vor %d Sekunden</string>
   <string name="just_now">Gerade eben</string>
   <string name="error_when_load_starred">Informationen zu Favoriten konnten nicht geladen werden</string>
+  <string name="error_when_load_events">Fehler beim Laden der Aktivitäten</string>
   <string name="open_as">Öffnen als</string>
   <string name="select_upload_files">Dateien zum Hochladen auswählen</string>
   <string name="storage_removed">Speicher wurde entfernt</string>
@@ -459,4 +463,5 @@ Zum Aktualisieren einmal antippen</string>
   <string name="clear_password_failed">Fehler: Das Passwort konnte nicht gelöscht werden</string>
   <string name="clear_password_warning">Möchten Sie das Passwort löschen?</string>
   <string name="clear_password_auto">Passwörter automatisch löschen</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4f649fad9..1d9206c2e 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -9,7 +9,6 @@
   <string name="delete_dir">Διαγραφή φακέλου</string>
   <string name="server_hint">Διακομιστής, όπως cloud.seafile.com</string>
   <string name="passwd_hint">Κωδικός</string>
-  <string name="login">Σύνδεση</string>
   <string name="open_file">Άνοιγμα</string>
   <string name="download_file">Λήψη</string>
   <string name="redownload_file">Λήψη ξανά</string>
@@ -174,4 +173,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
index 6af754acd..a1d25427e 100644
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ b/app/src/main/res/values-en-rUS/strings.xml
@@ -21,4 +21,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 5b4085757..b44a6ec1c 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">Eliminar archivo</string>
   <string name="delete_dir">Eliminar carpeta</string>
   <string name="server_hint">Dirección del servidor</string>
-  <string name="email_hint">Nombre de usuario o dirección de correo electrónico</string>
   <string name="passwd_hint">Contraseña</string>
-  <string name="login">Ingresar</string>
   <string name="open_file">Abrir</string>
   <string name="download_file">Descargar</string>
   <string name="redownload_file">Descargar otra vez</string>
@@ -457,4 +455,5 @@
   <string name="clear_password_failed">Blanquear contraseña falló</string>
   <string name="clear_password_warning">¿Desea blanquear la contraseña?</string>
   <string name="clear_password_auto">Blanquear contraseñas automáticamente</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 6af754acd..a1d25427e 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -21,4 +21,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5b4085757..b44a6ec1c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">Eliminar archivo</string>
   <string name="delete_dir">Eliminar carpeta</string>
   <string name="server_hint">Dirección del servidor</string>
-  <string name="email_hint">Nombre de usuario o dirección de correo electrónico</string>
   <string name="passwd_hint">Contraseña</string>
-  <string name="login">Ingresar</string>
   <string name="open_file">Abrir</string>
   <string name="download_file">Descargar</string>
   <string name="redownload_file">Descargar otra vez</string>
@@ -457,4 +455,5 @@
   <string name="clear_password_failed">Blanquear contraseña falló</string>
   <string name="clear_password_warning">¿Desea blanquear la contraseña?</string>
   <string name="clear_password_auto">Blanquear contraseñas automáticamente</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 6af754acd..a1d25427e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -21,4 +21,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d77f6c929..4fa6e3fe9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">Effacer le fichier</string>
   <string name="delete_dir">Effacer le dossier</string>
   <string name="server_hint">Serveur, par exemple cloud.seafile.com</string>
-  <string name="email_hint">Nom d\'utilisateur ou adresse de messagerie</string>
   <string name="passwd_hint">Mot de passe</string>
-  <string name="login">Connexion</string>
   <string name="open_file">Ouvrir</string>
   <string name="download_file">Télécharger</string>
   <string name="redownload_file">Télécharger à nouveau</string>
@@ -36,9 +34,14 @@
     <item>Autres</item>
   </string-array>
   <string name="choose_server">Choisir un serveur Seafile</string>
+  <string-array name="choose_server_array">
+    <item>SeaCloud.cc</item>
+    <item>Identifiant Shibboleth</item>
+    <item>Autre Serveur Seafile</item>
+  </string-array>
   <string name="network_down">Absence de connexion réseau</string>
   <string name="unknow_error">Erreur inconnue</string>
-  <string name="invalid_server_address">Nom de serveur invalide</string>
+  <string name="invalid_server_address">Adresse de serveur invalide</string>
   <string name="err_server_andress_empty">L\'adresse du serveur ne peut être vide</string>
   <string name="err_email_empty">E-mail ne peut être vide</string>
   <string name="err_passwd_empty">Le mot de passe ne peut être vide</string>
@@ -175,6 +178,7 @@
   <string name="seconds_ago">il y a %d secondes </string>
   <string name="just_now">À l\'instant</string>
   <string name="error_when_load_starred">Erreur de chargement des fichiers préférés</string>
+  <string name="error_when_load_events">Erreur lors du chargements des activités</string>
   <string name="open_as">Ouvrir comme</string>
   <string name="select_upload_files">Sélectionner les fichiers à envoyer</string>
   <string name="storage_removed">Le stockage a été supprimé</string>
@@ -456,4 +460,5 @@ E-mail : support@seafile.com<br>
   <string name="clear_password_failed">Echec de l\'effacement du mot de passe</string>
   <string name="clear_password_warning">Voulez-vous effacer le mot de passe ?</string>
   <string name="clear_password_auto">Effacement auto des mots de passe</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 6af754acd..a1d25427e 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -21,4 +21,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ccfbaf696..e67cee672 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -7,9 +7,7 @@
   <string name="delete">Töröl</string>
   <string name="delete_file_f">Fájl törlés</string>
   <string name="delete_dir">Könyvtár törlés</string>
-  <string name="email_hint">Felhasználói név vagy e-mail cím</string>
   <string name="passwd_hint">Jelszó</string>
-  <string name="login">Belépés</string>
   <string name="open_file">Megnyit</string>
   <string name="download_file">Letölt</string>
   <string name="redownload_file">Újra letölt</string>
@@ -399,4 +397,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-is-rIS/strings.xml b/app/src/main/res/values-is-rIS/strings.xml
index 2534b9622..19a35c53d 100644
--- a/app/src/main/res/values-is-rIS/strings.xml
+++ b/app/src/main/res/values-is-rIS/strings.xml
@@ -7,9 +7,7 @@
   <string name="delete">Eyða</string>
   <string name="delete_file_f">Eyða skrá</string>
   <string name="delete_dir">Eyða skráasafni</string>
-  <string name="email_hint">Notendanafn eða netfang</string>
   <string name="passwd_hint">Lykilorð</string>
-  <string name="login">Innská</string>
   <string name="open_file">Opna</string>
   <string name="download_file">Hala niður</string>
   <string name="redownload_file">Hala niður aftur</string>
@@ -399,4 +397,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index da7613b4b..af8e7e0da 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -8,7 +8,6 @@
   <string name="delete_file_f">Cancella file</string>
   <string name="delete_dir">Cancella cartella</string>
   <string name="passwd_hint">Password</string>
-  <string name="login">Login</string>
   <string name="open_file">Apri</string>
   <string name="download_file">Scarica</string>
   <string name="redownload_file">Scarica nuovamente</string>
@@ -149,4 +148,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index a847d6c85..30a040471 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -10,7 +10,7 @@
   <string name="delete_file_f">ファイルを削除</string>
   <string name="delete_dir">フォルダーを削除</string>
   <string name="server_hint">サーバーアドレス</string>
-  <string name="email_hint">ユーザー名またはメールアドレス</string>
+  <string name="email_hint">メールアドレスまたはユーザー名</string>
   <string name="passwd_hint">パスワード</string>
   <string name="login">ログイン</string>
   <string name="open_file">開く</string>
@@ -36,6 +36,11 @@
     <item>その他</item>
   </string-array>
   <string name="choose_server">Seafile サーバーを選択</string>
+  <string-array name="choose_server_array">
+    <item>SeaCloud.cc</item>
+    <item>Shibboleth ログイン</item>
+    <item>他の Seafile サーバー</item>
+  </string-array>
   <string name="network_down">ネットワーク接続がありません</string>
   <string name="unknow_error">不明なエラー</string>
   <string name="invalid_server_address">サーバーアドレスが正しくありません</string>
@@ -174,6 +179,7 @@
   <string name="seconds_ago">%d 秒前</string>
   <string name="just_now">たった今</string>
   <string name="error_when_load_starred">スター付きファイルの読み込み時にエラー</string>
+  <string name="error_when_load_events">アクティビティの読み込み時にエラー</string>
   <string name="open_as">...として開く</string>
   <string name="select_upload_files">アップロードするファイルを選択してください</string>
   <string name="storage_removed">ストレージは削除されました</string>
@@ -448,4 +454,6 @@
   <string name="clear_password_failed">パスワードのクリアに失敗しました</string>
   <string name="clear_password_warning">パスワードをクリアしますか?</string>
   <string name="clear_password_auto">パスワードを自動クリア</string>
+  <!--Two factor auth-->
+  <string name="two_factor_auth_token_empty">認証トークンは空にできません</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 1d9e74364..10de02c37 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">파일 삭제</string>
   <string name="delete_dir">폴더 삭제</string>
   <string name="server_hint">서버 주소</string>
-  <string name="email_hint">사용자 이름 또는 전자메일 주소</string>
   <string name="passwd_hint">암호</string>
-  <string name="login">로그인</string>
   <string name="open_file">열기</string>
   <string name="download_file">다운로드</string>
   <string name="redownload_file">다시 다운로드</string>
@@ -447,4 +445,5 @@
   <string name="clear_password_successful">암호 삭제에 성공했습니다</string>
   <string name="clear_password_failed">암호 삭제에 실패했습니다</string>
   <string name="clear_password_warning">암호를 삭제할까요?</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 6af754acd..a1d25427e 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -21,4 +21,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index ce36a3c4b..78414ce39 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -8,7 +8,6 @@
   <string name="delete_file_f">Slett fil</string>
   <string name="delete_dir">Slett mappe</string>
   <string name="passwd_hint">Passord</string>
-  <string name="login">Logg inn</string>
   <string name="open_file">Åpne</string>
   <string name="download_file">Last ned</string>
   <string name="redownload_file">Last ned på nytt</string>
@@ -380,4 +379,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 819a68b00..c07dae76c 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">Bestand verwijderen</string>
   <string name="delete_dir">Map verwijderen</string>
   <string name="server_hint">Server, zoals cloud.seafile.com</string>
-  <string name="email_hint">Gebruikersnaam of e-mailadres</string>
   <string name="passwd_hint">Wachtwoord</string>
-  <string name="login">Aanmelden</string>
   <string name="open_file">Open</string>
   <string name="download_file">Download</string>
   <string name="redownload_file">Opnieuw downloaden</string>
@@ -432,4 +430,5 @@
   <string name="clear_password_successful">Wachtwoord verwijderen gelukt</string>
   <string name="clear_password_failed">Wachtwoord verwijderen mislukt</string>
   <string name="clear_password_warning">Wil je het wachtwoord verwijderen?</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 8d2ffa94d..cbf5e13ed 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">Usuń plik</string>
   <string name="delete_dir">Usuń folder</string>
   <string name="server_hint">Adres serwera</string>
-  <string name="email_hint">Nazwa użytkownika lub adres email</string>
   <string name="passwd_hint">Hasło</string>
-  <string name="login">Login</string>
   <string name="open_file">Otwórz</string>
   <string name="download_file">Pobierz</string>
   <string name="redownload_file">Pobierz ponownie</string>
@@ -36,6 +34,11 @@
     <item>Inne</item>
   </string-array>
   <string name="choose_server">Wybierz serwer Seafile</string>
+  <string-array name="choose_server_array">
+    <item>SeaCloud.cc</item>
+    <item>Logowanie Shibboleth</item>
+    <item>Inny serwer Seafile</item>
+  </string-array>
   <string name="network_down">Brak połączenia z siecią</string>
   <string name="unknow_error">Nieznany błąd</string>
   <string name="invalid_server_address">Nieprawidłowy adres serwera</string>
@@ -176,6 +179,7 @@
   <string name="seconds_ago">%d sekundy temu</string>
   <string name="just_now">Przed chwilą</string>
   <string name="error_when_load_starred">Błąd podczas wczytywania ulubionych plików</string>
+  <string name="error_when_load_events">Błąd podczas wczytywania aktywności</string>
   <string name="open_as">Otwórz jako</string>
   <string name="select_upload_files">Wybierz pliki do przesłania</string>
   <string name="storage_removed">Magazyn został usunięty</string>
@@ -466,4 +470,5 @@
   <string name="clear_password_failed">Nie udało się wyczyścić hasła</string>
   <string name="clear_password_warning">Czy chcesz wyczyścić hasło?</string>
   <string name="clear_password_auto">Automatycznie czyść hasła</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5149b6a34..815b5955d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -8,7 +8,6 @@
   <string name="delete_file_f">Deletar arquivo</string>
   <string name="delete_dir">Deletar pasta</string>
   <string name="passwd_hint">Senha</string>
-  <string name="login">Usuario</string>
   <string name="open_file">Abrir</string>
   <string name="download_file">Descarregar</string>
   <string name="redownload_file">Descarregar denovo</string>
@@ -332,4 +331,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index cea18001a..a1a321029 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -10,9 +10,7 @@
   <string name="delete_file_f">Удалить файл</string>
   <string name="delete_dir">Удалить папку</string>
   <string name="server_hint">Адрес сервера</string>
-  <string name="email_hint">Логин или email</string>
   <string name="passwd_hint">Пароль</string>
-  <string name="login">Войти</string>
   <string name="open_file">Открыть</string>
   <string name="download_file">Скачать</string>
   <string name="redownload_file">Скачать еще раз</string>
@@ -36,6 +34,11 @@
     <item>Другое</item>
   </string-array>
   <string name="choose_server">Выберите сервер Seafile</string>
+  <string-array name="choose_server_array">
+    <item>SeaCloud.cc</item>
+    <item>Shibboleth Login</item>
+    <item>Другой Seafile сервер</item>
+  </string-array>
   <string name="network_down">Нет соединения с сетью</string>
   <string name="unknow_error">Неизвестная ошибка</string>
   <string name="invalid_server_address">Неправильный адрес сервера</string>
@@ -177,6 +180,7 @@
   <string name="seconds_ago">%d секунд назад</string>
   <string name="just_now">Прямо сейчас</string>
   <string name="error_when_load_starred">Ошибка загрузки помеченных файлов</string>
+  <string name="error_when_load_events">Ошибка загрузки действий</string>
   <string name="open_as">Открыть как</string>
   <string name="select_upload_files">Выберите файлы для загрузки</string>
   <string name="storage_removed">Хранилище было удалено</string>
@@ -475,4 +479,5 @@
   <string name="clear_password_failed">Удаление пароля прошло неудачно</string>
   <string name="clear_password_warning">Вы хотите удалить пароль?</string>
   <string name="clear_password_auto">Автоматический сброс паролей</string>
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cade9ad8e..4ca4cea84 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -8,7 +8,6 @@
   <string name="delete_file_f">Dosyayı  sil</string>
   <string name="delete_dir">Dizini sil</string>
   <string name="passwd_hint">Şifre</string>
-  <string name="login">Giriş yap</string>
   <string name="open_file">Aç</string>
   <string name="download_file">İndir</string>
   <string name="redownload_file">Tekrar indir</string>
@@ -199,4 +198,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 6af754acd..a1d25427e 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -21,4 +21,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8122715cd..93a46acf0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -10,7 +10,7 @@
   <string name="delete_file_f">删除文件</string>
   <string name="delete_dir">删除文件夹</string>
   <string name="server_hint">服务器地址</string>
-  <string name="email_hint">用户名或邮箱</string>
+  <string name="email_hint">邮箱或用户名</string>
   <string name="passwd_hint">密码</string>
   <string name="login">登录</string>
   <string name="open_file">打开</string>
@@ -179,6 +179,7 @@
   <string name="seconds_ago">%d秒前</string>
   <string name="just_now">刚刚更新</string>
   <string name="error_when_load_starred">加载星标文件失败</string>
+  <string name="error_when_load_events">加载活动时失败</string>
   <string name="open_as">打开为</string>
   <string name="select_upload_files">请选择要上传的文件</string>
   <string name="storage_removed">存储卡已被移出</string>
@@ -453,4 +454,9 @@
   <string name="clear_password_failed">清除密码失败</string>
   <string name="clear_password_warning">你想清除密码吗？</string>
   <string name="clear_password_auto">自动清除密码</string>
+  <!--Two factor auth-->
+  <string name="two_factor_auth_error">请输入验证码</string>
+  <string name="two_factor_auth_invalid">验证码无效</string>
+  <string name="two_factor_auth_token">两步验证码</string>
+  <string name="two_factor_auth_token_empty">验证码不能为空</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 86a3f9d10..4d4736ec3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -8,7 +8,6 @@
   <string name="delete_file_f">刪除文件</string>
   <string name="delete_dir">刪除文件夾</string>
   <string name="passwd_hint">密碼</string>
-  <string name="login">登錄</string>
   <string name="open_file">打開</string>
   <string name="download_file">下載</string>
   <string name="redownload_file">重新下載</string>
@@ -130,4 +129,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 6af754acd..a1d25427e 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -21,4 +21,5 @@
   <!--permission-->
   <!--client sid encryption and decryption-->
   <!--clear password-->
+  <!--Two factor auth-->
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3f7c7aca..eff88d7bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -499,8 +499,8 @@
     <string name="clear_password_auto">Auto clear passwords</string>
 
     <!-- Two factor auth -->
-    <string name="two_factor_auth_error">Two-factor authentication token is required</string>
-    <string name="two_factor_auth_invalid">Two-factor authentication token is invalid</string>
-    <string name="two_factor_auth_token">Authentication token</string>
+    <string name="two_factor_auth_error">authentication token is required</string>
+    <string name="two_factor_auth_invalid">authentication token is invalid</string>
+    <string name="two_factor_auth_token">Two-factor Authentication token</string>
     <string name="two_factor_auth_token_empty">Authentication token can\`t be empty</string>
 </resources>