diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 88bc9b8d3..54e2d1c9e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,11 +45,11 @@
                   android:label="@string/app_name">
         </activity>
 
-        <activity android:name=".account.ui.ShibbolethActivity"
+        <activity android:name=".account.ui.SingleSignOnActivity"
                   android:label="@string/app_name">
         </activity>
 
-        <activity android:name=".account.ui.ShibbolethAuthorizeActivity"
+        <activity android:name=".account.ui.SingleSignOnAuthorizeActivity"
                   android:label="@string/app_name">
         </activity>
 
diff --git a/app/src/main/java/com/seafile/seadroid2/account/ui/SeafileAuthenticatorActivity.java b/app/src/main/java/com/seafile/seadroid2/account/ui/SeafileAuthenticatorActivity.java
index 27162aecc..3bb48112f 100644
--- a/app/src/main/java/com/seafile/seadroid2/account/ui/SeafileAuthenticatorActivity.java
+++ b/app/src/main/java/com/seafile/seadroid2/account/ui/SeafileAuthenticatorActivity.java
@@ -27,7 +27,7 @@
 public class SeafileAuthenticatorActivity extends BaseAuthenticatorActivity {
 
     public static final int SEACLOUD_CC = 0;
-    public static final int SHIBBOLETH_LOGIN = 1;
+    public static final int SINGLE_SIGN_ON_LOGIN = 1;
     public static final int OTHER_SERVER = 2;
 
     public final static String ARG_ACCOUNT_TYPE = "ACCOUNT_TYPE";
@@ -69,8 +69,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                         intent.putExtra(SeafileAuthenticatorActivity.ARG_SERVER_URI, getString(R.string.server_url_seacloud));
                         startActivityForResult(intent, SeafileAuthenticatorActivity.REQ_SIGNUP);
                         break;
-                    case SHIBBOLETH_LOGIN:
-                        intent = new Intent(SeafileAuthenticatorActivity.this, ShibbolethActivity.class);
+                    case SINGLE_SIGN_ON_LOGIN:
+                        intent = new Intent(SeafileAuthenticatorActivity.this, SingleSignOnActivity.class);
                         intent.putExtras(getIntent());
                         startActivityForResult(intent, SeafileAuthenticatorActivity.REQ_SIGNUP);
                         break;
@@ -88,9 +88,9 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         mAccountManager = AccountManager.get(getBaseContext());
 
         if (getIntent().getBooleanExtra(ARG_SHIB, false)) {
-            Intent intent = new Intent(this, ShibbolethAuthorizeActivity.class);
+            Intent intent = new Intent(this, SingleSignOnAuthorizeActivity.class);
             android.accounts.Account account = new android.accounts.Account(getIntent().getStringExtra(SeafileAuthenticatorActivity.ARG_ACCOUNT_NAME), com.seafile.seadroid2.account.Account.ACCOUNT_TYPE);
-            intent.putExtra(ShibbolethActivity.SHIBBOLETH_SERVER_URL, mAccountManager.getUserData(account, Authenticator.KEY_SERVER_URI));
+            intent.putExtra(SingleSignOnActivity.SINGLE_SIGN_ON_SERVER_URL, mAccountManager.getUserData(account, Authenticator.KEY_SERVER_URI));
             intent.putExtras(getIntent().getExtras());
             startActivityForResult(intent, SeafileAuthenticatorActivity.REQ_SIGNUP);
         } else if (getIntent().getBooleanExtra(ARG_IS_EDITING, false)) {
diff --git a/app/src/main/java/com/seafile/seadroid2/account/ui/ShibbolethActivity.java b/app/src/main/java/com/seafile/seadroid2/account/ui/SingleSignOnActivity.java
similarity index 67%
rename from app/src/main/java/com/seafile/seadroid2/account/ui/ShibbolethActivity.java
rename to app/src/main/java/com/seafile/seadroid2/account/ui/SingleSignOnActivity.java
index 0b0af770a..18ea8f5c6 100644
--- a/app/src/main/java/com/seafile/seadroid2/account/ui/ShibbolethActivity.java
+++ b/app/src/main/java/com/seafile/seadroid2/account/ui/SingleSignOnActivity.java
@@ -13,30 +13,30 @@
 import com.seafile.seadroid2.ui.activity.BaseActivity;
 
 /**
- * Shibboleth welcome page
+ * Single Sign-On welcome page
  * <p/>
  */
-public class ShibbolethActivity extends BaseActivity implements Toolbar.OnMenuItemClickListener {
-    public static final String DEBUG_TAG = "ShibbolethActivity";
+public class SingleSignOnActivity extends BaseActivity implements Toolbar.OnMenuItemClickListener {
+    public static final String DEBUG_TAG = "SingleSignOnActivity";
 
-    public static final String SHIBBOLETH_SERVER_URL = "shibboleth server url";
-    public static final String SHIBBOLETH_HTTPS_PREFIX = "https://";
+    public static final String SINGLE_SIGN_ON_SERVER_URL = "single sign on server url";
+    public static final String SINGLE_SIGN_ON_HTTPS_PREFIX = "https://";
 
     private Button mNextBtn;
     private EditText mServerUrlEt;
 
-    private static final int SHIBBOLETH_AUTH = 1;
+    private static final int SINGLE_SIGN_ON_AUTH = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.shibboleth_welcome_layout);
-        mNextBtn = (Button) findViewById(R.id.shibboleth_next_btn);
-        mServerUrlEt = (EditText) findViewById(R.id.shibboleth_server_url_et);
+        setContentView(R.layout.single_sign_on_welcome_layout);
+        mNextBtn = (Button) findViewById(R.id.single_sign_on_next_btn);
+        mServerUrlEt = (EditText) findViewById(R.id.single_sign_on_server_url_et);
 
-        mServerUrlEt.setText(SHIBBOLETH_HTTPS_PREFIX);
-        int prefixLen = SHIBBOLETH_HTTPS_PREFIX.length();
+        mServerUrlEt.setText(SINGLE_SIGN_ON_HTTPS_PREFIX);
+        int prefixLen = SINGLE_SIGN_ON_HTTPS_PREFIX.length();
         mServerUrlEt.setSelection(prefixLen, prefixLen);
 
         mNextBtn.setOnClickListener(new View.OnClickListener() {
@@ -52,7 +52,7 @@ public void onClick(View v) {
         toolbar.setOnMenuItemClickListener(this);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setTitle(R.string.shib_actionbar_title);
+        getSupportActionBar().setTitle(R.string.shib_login_title);
     }
 
         @Override
@@ -76,7 +76,7 @@ private boolean isServerUrlValid(String serverUrl) {
             return false;
         }
 
-        if (!serverUrl.startsWith(SHIBBOLETH_HTTPS_PREFIX)) {
+        if (!serverUrl.startsWith(SINGLE_SIGN_ON_HTTPS_PREFIX)) {
             showShortToast(this, getString(R.string.shib_server_incorrect_prefix));
             return false;
         }
@@ -90,10 +90,10 @@ private String getServerUrl() {
     }
 
     private void openAuthorizePage(String serverUrl) {
-        Intent intent = new Intent(ShibbolethActivity.this, ShibbolethAuthorizeActivity.class);
-        intent.putExtra(SHIBBOLETH_SERVER_URL, serverUrl);
+        Intent intent = new Intent(SingleSignOnActivity.this, SingleSignOnAuthorizeActivity.class);
+        intent.putExtra(SINGLE_SIGN_ON_SERVER_URL, serverUrl);
         intent.putExtras(getIntent());
-        startActivityForResult(intent, SHIBBOLETH_AUTH);
+        startActivityForResult(intent, SINGLE_SIGN_ON_AUTH);
     }
 
     @Override
@@ -101,7 +101,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         Log.d(DEBUG_TAG, "onActivityResult");
 
         // pass auth result back to the SeafileAuthenticatorActivity
-        if (requestCode == SHIBBOLETH_AUTH) {
+        if (requestCode == SINGLE_SIGN_ON_AUTH) {
             setResult(resultCode, data);
             finish();
         }
diff --git a/app/src/main/java/com/seafile/seadroid2/account/ui/ShibbolethAuthorizeActivity.java b/app/src/main/java/com/seafile/seadroid2/account/ui/SingleSignOnAuthorizeActivity.java
similarity index 93%
rename from app/src/main/java/com/seafile/seadroid2/account/ui/ShibbolethAuthorizeActivity.java
rename to app/src/main/java/com/seafile/seadroid2/account/ui/SingleSignOnAuthorizeActivity.java
index e7ded7ad7..0f2bf1507 100644
--- a/app/src/main/java/com/seafile/seadroid2/account/ui/ShibbolethAuthorizeActivity.java
+++ b/app/src/main/java/com/seafile/seadroid2/account/ui/SingleSignOnAuthorizeActivity.java
@@ -35,12 +35,12 @@
 import java.security.cert.X509Certificate;
 
 /**
- * Shibboleth Authorize page
+ * Single sign on Authorize page
  * use cookie to get authorized data
  * <p/>
  */
-public class ShibbolethAuthorizeActivity extends BaseActivity implements Toolbar.OnMenuItemClickListener {
-    public static final String DEBUG_TAG = "ShibbolethAuthorizeActivity";
+public class SingleSignOnAuthorizeActivity extends BaseActivity implements Toolbar.OnMenuItemClickListener {
+    public static final String DEBUG_TAG = "SingleSignOnAuthorizeActivity";
 
     public static final String SEAHUB_SHIB_COOKIE_NAME = "seahub_auth";
     private WebView mWebview;
@@ -50,9 +50,9 @@ public class ShibbolethAuthorizeActivity extends BaseActivity implements Toolbar
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.shibboleth_authorize_layout);
-        mWebview = (WebView) findViewById(R.id.shibboleth_authorize_wv);
-        mloadingAnimation = (LinearLayout) findViewById(R.id.shibboleth_loading_ll);
+        setContentView(R.layout.single_sign_on_authorize_layout);
+        mWebview = (WebView) findViewById(R.id.single_sign_on_authorize_wv);
+        mloadingAnimation = (LinearLayout) findViewById(R.id.single_sign_on_loading_ll);
 
         mWebview.getSettings().setLoadsImagesAutomatically(true);
         mWebview.getSettings().setJavaScriptEnabled(true);
@@ -65,9 +65,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         toolbar.setOnMenuItemClickListener(this);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setTitle(R.string.shib_actionbar_title);
+        getSupportActionBar().setTitle(R.string.shib_login_title);
 
-        String url = getIntent().getStringExtra(ShibbolethActivity.SHIBBOLETH_SERVER_URL);
+        String url = getIntent().getStringExtra(SingleSignOnActivity.SINGLE_SIGN_ON_SERVER_URL);
         CookieManager.getInstance().removeAllCookie();
         openAuthorizePage(url);
     }
@@ -164,7 +164,7 @@ class CustomWebviewClient extends WebViewClient {
         @Override
         public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
             // Display error messages
-            showShortToast(ShibbolethAuthorizeActivity.this,
+            showShortToast(SingleSignOnAuthorizeActivity.this,
                     String.format((R.string.shib_load_page_error) + description));
 
             showPageLoading(false);
@@ -239,7 +239,7 @@ private void returnAccount(Account account) {
         retData.putExtra(SeafileAuthenticatorActivity.ARG_SHIB, account.isShib());
         retData.putExtra(SeafileAuthenticatorActivity.ARG_SERVER_URI, account.getServer());
 
-        // pass auth result back to the ShibbolethActivity
+        // pass auth result back to the SingleSignOnActivity
         setResult(RESULT_OK, retData);
         finish();
     }
diff --git a/app/src/main/res/layout/shibboleth_welcome_layout.xml b/app/src/main/res/layout/shibboleth_welcome_layout.xml
deleted file mode 100644
index 7cb704ce0..000000000
--- a/app/src/main/res/layout/shibboleth_welcome_layout.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical">
-    <include layout="@layout/toolbar_actionbar" /> <!-- placeholder, empty except on L -->
-    <ImageView android:layout_width="match_parent"
-               android:layout_height="48dp"
-               android:src="@drawable/shibboleth"
-               android:layout_marginTop="15dp"
-               android:layout_marginBottom="10dp"
-               android:layout_marginLeft="@dimen/et_margin_left"
-               android:layout_marginRight="@dimen/et_margin_right"/>
-    <TextView android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/shib_login_title"
-              android:layout_marginTop="@dimen/tv_subtitle_margin_top"
-              android:layout_marginBottom="10dp"
-              android:layout_marginLeft="@dimen/et_margin_left"
-              android:layout_marginRight="@dimen/et_margin_right"
-              android:textColor="@color/fancy_orange"
-              android:textSize="@dimen/tv_subtitle_txt_size"
-              android:gravity="center_horizontal"
-              android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <EditText
-            android:id="@+id/shibboleth_server_url_et"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/shib_server_hint"
-            android:inputType="textUri"
-            android:background="@drawable/edit_text_holo_light"
-            android:layout_marginLeft="@dimen/et_margin_left"
-            android:layout_marginRight="@dimen/et_margin_right"/>
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingBottom="10dp"
-            android:layout_marginTop="15dp">
-
-        <Button
-                android:id="@+id/shibboleth_next_btn"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/long_btn_height"
-                android:layout_marginLeft="@dimen/long_btn_margin_left"
-                android:layout_marginRight="@dimen/long_btn_margin_right"
-                android:onClick="login"
-                android:text="@string/lockpattern_continue_button_text"
-                android:textColor="@color/white"
-                android:textSize="@dimen/long_btn_txt_size"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/shibboleth_authorize_layout.xml b/app/src/main/res/layout/single_sign_on_authorize_layout.xml
similarity index 91%
rename from app/src/main/res/layout/shibboleth_authorize_layout.xml
rename to app/src/main/res/layout/single_sign_on_authorize_layout.xml
index 4cb7ecda2..b709ad8b7 100644
--- a/app/src/main/res/layout/shibboleth_authorize_layout.xml
+++ b/app/src/main/res/layout/single_sign_on_authorize_layout.xml
@@ -5,7 +5,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
     <include layout="@layout/toolbar_actionbar" /> <!-- placeholder, empty except on L -->
-    <LinearLayout android:id="@+id/shibboleth_loading_ll"
+    <LinearLayout android:id="@+id/single_sign_on_loading_ll"
                   android:orientation="vertical"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
@@ -24,7 +24,7 @@
 
     </LinearLayout>
 
-    <WebView android:id="@+id/shibboleth_authorize_wv"
+    <WebView android:id="@+id/single_sign_on_authorize_wv"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:layout_margin="10dp">
diff --git a/app/src/main/res/layout/single_sign_on_welcome_layout.xml b/app/src/main/res/layout/single_sign_on_welcome_layout.xml
new file mode 100644
index 000000000..9c93ca7e9
--- /dev/null
+++ b/app/src/main/res/layout/single_sign_on_welcome_layout.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
+    <include layout="@layout/toolbar_actionbar"/><!-- placeholder, empty except on L -->
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/server_hint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp">
+
+        <EditText
+            android:id="@+id/single_sign_on_server_url_et"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/et_margin_left"
+            android:layout_marginRight="@dimen/et_margin_right"
+            android:background="@drawable/edit_text_holo_light"
+            android:hint="@string/server_hint"
+            android:inputType="textUri"/>
+
+    </android.support.design.widget.TextInputLayout>
+
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingBottom="10dp"
+            android:layout_marginTop="15dp">
+
+        <Button
+                android:id="@+id/single_sign_on_next_btn"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/long_btn_height"
+                android:layout_marginLeft="@dimen/long_btn_margin_left"
+                android:layout_marginRight="@dimen/long_btn_margin_right"
+                android:onClick="login"
+                android:text="@string/lockpattern_continue_button_text"
+                android:textColor="@color/white"
+                android:textSize="@dimen/long_btn_txt_size"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 6b1041964..7d73cefcc 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -236,12 +236,9 @@
   <string name="saf_file_not_downloaded_exception">Nelze stáhnout soubor %s ze serveru.</string>
   <string name="saf_write_diretory_exception">Nelze otevřít složku pro čtení/zápis.</string>
   <string name="saf_account_not_found_exception">Nelze nalézt Seafile účet.</string>
-  <!--shibboleth SSO-->
+  <!--Single sign on SSO-->
   <string name="shib_server_url_empty">Zadejte adresu serveru!</string>
   <string name="shib_load_page_error">Chyba:</string>
-  <string name="shib_login_title">Shibboleth Login</string>
-  <string name="shib_server_hint">Zadejte server...</string>
-  <string name="shib_actionbar_title">Přihlásit pomocí Shibboleth</string>
   <string name="shib_loading">načítání...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Chyba připojení k síti. Prosím, zkuste to později!</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 31788ae7c..611a268f5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -6,7 +6,7 @@
   <string name="delete_account">Löschen</string>
   <string name="delete">Löschen</string>
   <string name="delete_repo">Möchten Sie die Bibliothek wirklich löschen?</string>
-  <string name="delete_file">Diese Datei oder diesen Ordner wirklich löschen?</string>
+  <string name="delete_file">Möchten Sie die Datei oder den Ordner wirklich löschen?</string>
   <string name="delete_successful">Erfolgreich gelöscht</string>
   <string name="delete_repo_title">Bibliothek löschen</string>
   <string name="delete_file_f">Datei löschen</string>
@@ -41,11 +41,6 @@
     <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">Die Serveradresse ist nicht gültig</string>
@@ -418,13 +413,10 @@ Zum Aktualisieren einmal antippen</string>
   <string name="saf_failed_to_create_directory">Konnte Ordner %s nicht erstellen</string>
   <string name="saf_file_exist">Die Datei ist schon vorhanden</string>
   <string name="saf_bad_mime_type">Ungültige Anforderungsart</string>
-  <!--shibboleth SSO-->
+  <!--Single sign on SSO-->
   <string name="shib_server_url_empty">Geben Sie die Serveradresse an</string>
   <string name="shib_server_incorrect_prefix">Die Serveradresse sollte mit https:// beginnen</string>
   <string name="shib_load_page_error">Fehler:</string>
-  <string name="shib_login_title">Shibboleth-Anmeldung</string>
-  <string name="shib_server_hint">Server eintragen …</string>
-  <string name="shib_actionbar_title">Mit Shibboleth anmelden</string>
   <string name="shib_loading">Lade…</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Problem bei der Netzwerkverbindung. Bitte versuchen Sie es später nochmal!</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e826aaf80..b37e0e7aa 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -155,7 +155,7 @@
   <!--storage access framework-->
   <string name="saf_file_not_downloaded_exception">Δεν ήταν δυνατή η λήψη του αρχείου %s από το διακομιστή.</string>
   <string name="saf_upload_path_not_available">Αποτυχία μεταφόρτωσης, δεν υπάρχει η διαδρομή</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <!--Transfer List-->
   <string name="transfer_tabs_downloads">Λίστα λήψεων</string>
   <string name="transfer_tabs_uploads">Λίστα μεταφορτώσεων</string>
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
deleted file mode 100644
index f6dac1e48..000000000
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!--Strings for possible PreferenceActivity Back/Next buttons-->
-  <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
-  <!--contacts  upload-->
-  <!--contacts Upload Perference-->
-  <!--Camera Upload Preference-->
-  <!--Camera Upload Configuration View-->
-  <!--Camera Sync-->
-  <!--pull to refresh-->
-  <!--storage access framework-->
-  <!--shibboleth SSO-->
-  <!--Transfer List-->
-  <!--Sort-->
-  <!--Search-->
-  <!--star a file-->
-  <!--unstar a file-->
-  <!--notification bar-->
-  <!--Gallery-->
-  <!--Overwrite existing files-->
-  <!--Action Mode-->
-  <!--Accessibility description for navigation drawer-->
-  <!--permission-->
-  <!--client side encryption and decryption-->
-  <!--clear password-->
-  <!--Two factor auth-->
-  <!--Operation Exceptions-->
-  <!--Home list title-->
-</resources>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index bda488750..2ff5cdbee 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -41,11 +41,6 @@
     <item>Otro</item>
   </string-array>
   <string name="choose_server">Elija un Servidor Seafile</string>
-  <string-array name="choose_server_array">
-    <item>SeaCloud.cc</item>
-    <item>Inicio con Shibboleth</item>
-    <item>Otro Servidor Seafile</item>
-  </string-array>
   <string name="network_down">Sin conexión de red</string>
   <string name="unknow_error">Error desconocido</string>
   <string name="invalid_server_address">Dirección de servidor inválida</string>
@@ -416,13 +411,10 @@
   <string name="saf_failed_to_create_directory">No se pudo crear la carpeta %s</string>
   <string name="saf_file_exist">Ese archivo ya existe</string>
   <string name="saf_bad_mime_type">Tipo de solicitud incorrecto</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">¡El servidor está vacío!</string>
   <string name="shib_server_incorrect_prefix">El servidor debe comenzar con https://</string>
   <string name="shib_load_page_error">Error:</string>
-  <string name="shib_login_title">Inicio de sesión con Shibboleth</string>
-  <string name="shib_server_hint">Ingrese servidor...</string>
-  <string name="shib_actionbar_title">Iniciar sesión con Shibboleth</string>
   <string name="shib_loading">cargando...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Error de conexión de red, por favor intente más tarde.</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
deleted file mode 100644
index f6dac1e48..000000000
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!--Strings for possible PreferenceActivity Back/Next buttons-->
-  <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
-  <!--contacts  upload-->
-  <!--contacts Upload Perference-->
-  <!--Camera Upload Preference-->
-  <!--Camera Upload Configuration View-->
-  <!--Camera Sync-->
-  <!--pull to refresh-->
-  <!--storage access framework-->
-  <!--shibboleth SSO-->
-  <!--Transfer List-->
-  <!--Sort-->
-  <!--Search-->
-  <!--star a file-->
-  <!--unstar a file-->
-  <!--notification bar-->
-  <!--Gallery-->
-  <!--Overwrite existing files-->
-  <!--Action Mode-->
-  <!--Accessibility description for navigation drawer-->
-  <!--permission-->
-  <!--client side encryption and decryption-->
-  <!--clear password-->
-  <!--Two factor auth-->
-  <!--Operation Exceptions-->
-  <!--Home list title-->
-</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bda488750..e57b68c84 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -41,11 +41,6 @@
     <item>Otro</item>
   </string-array>
   <string name="choose_server">Elija un Servidor Seafile</string>
-  <string-array name="choose_server_array">
-    <item>SeaCloud.cc</item>
-    <item>Inicio con Shibboleth</item>
-    <item>Otro Servidor Seafile</item>
-  </string-array>
   <string name="network_down">Sin conexión de red</string>
   <string name="unknow_error">Error desconocido</string>
   <string name="invalid_server_address">Dirección de servidor inválida</string>
@@ -416,13 +411,10 @@
   <string name="saf_failed_to_create_directory">No se pudo crear la carpeta %s</string>
   <string name="saf_file_exist">Ese archivo ya existe</string>
   <string name="saf_bad_mime_type">Tipo de solicitud incorrecto</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On  SSO-->
   <string name="shib_server_url_empty">¡El servidor está vacío!</string>
   <string name="shib_server_incorrect_prefix">El servidor debe comenzar con https://</string>
   <string name="shib_load_page_error">Error:</string>
-  <string name="shib_login_title">Inicio de sesión con Shibboleth</string>
-  <string name="shib_server_hint">Ingrese servidor...</string>
-  <string name="shib_actionbar_title">Iniciar sesión con Shibboleth</string>
   <string name="shib_loading">cargando...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Error de conexión de red, por favor intente más tarde.</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index d63501236..368e5139c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -41,11 +41,6 @@
     <item>Muut</item>
   </string-array>
   <string name="choose_server">Valitse Seafile Palvelin</string>
-  <string-array name="choose_server_array">
-    <item>SeaCloud.cc</item>
-    <item>Shibboleth Kirjautuminen</item>
-    <item>Muu Seafile Palvelin</item>
-  </string-array>
   <string name="network_down">Ei verkkoyhteyttä</string>
   <string name="unknow_error">Tuntematon virhe</string>
   <string name="invalid_server_address">Virheellinen palvelimen osoite</string>
@@ -412,12 +407,9 @@ Sähköposti: support@seafile.com<br>
   <string name="saf_failed_to_create_directory">Ei voinut luoda hakemistoa %s</string>
   <string name="saf_file_exist">Tiedosto on jo olemassa</string>
   <string name="saf_bad_mime_type">Huono pyyntö tyyppi</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">Palvelin on tyhjä!</string>
   <string name="shib_load_page_error">Virhe:</string>
-  <string name="shib_login_title">Shibboleth Kirjautuminen</string>
-  <string name="shib_server_hint">Syöttö serveri...</string>
-  <string name="shib_actionbar_title">Kirjaudu Shibbolethilla</string>
   <string name="shib_loading">Ladataan...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Verkkoyhteys virhe, ole hyvä ja yritä myöhemmin uudelleen!</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index aed71dd53..bd3141927 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -41,11 +41,6 @@
     <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">Adresse de serveur invalide</string>
@@ -412,12 +407,9 @@ E-mail : support@seafile.com<br>
   <string name="saf_failed_to_create_directory">Impossible de créer le répertoire %s</string>
   <string name="saf_file_exist">Ce fichier existe déjà.</string>
   <string name="saf_bad_mime_type"> type erroné de requête</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">La saisie du  serveur est vide !</string>
   <string name="shib_load_page_error">Erreur :</string>
-  <string name="shib_login_title">Connexion shibboleth</string>
-  <string name="shib_server_hint">Entrez le serveur...</string>
-  <string name="shib_actionbar_title">Connexion avec shibboleth</string>
   <string name="shib_loading">Chargement...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Erreur de connexion réseau, réessayer plus tard !</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
deleted file mode 100644
index f6dac1e48..000000000
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!--Strings for possible PreferenceActivity Back/Next buttons-->
-  <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
-  <!--contacts  upload-->
-  <!--contacts Upload Perference-->
-  <!--Camera Upload Preference-->
-  <!--Camera Upload Configuration View-->
-  <!--Camera Sync-->
-  <!--pull to refresh-->
-  <!--storage access framework-->
-  <!--shibboleth SSO-->
-  <!--Transfer List-->
-  <!--Sort-->
-  <!--Search-->
-  <!--star a file-->
-  <!--unstar a file-->
-  <!--notification bar-->
-  <!--Gallery-->
-  <!--Overwrite existing files-->
-  <!--Action Mode-->
-  <!--Accessibility description for navigation drawer-->
-  <!--permission-->
-  <!--client side encryption and decryption-->
-  <!--clear password-->
-  <!--Two factor auth-->
-  <!--Operation Exceptions-->
-  <!--Home list title-->
-</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 93404fc5c..d36c07351 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -41,11 +41,6 @@
     <item>Más</item>
   </string-array>
   <string name="choose_server">Seafile szerver választás</string>
-  <string-array name="choose_server_array">
-    <item>SeaCloud.cc</item>
-    <item>Shibboleth bejelentkezés</item>
-    <item>Egyéb Seafile szerver</item>
-  </string-array>
   <string name="network_down">Nincs hálózati kapcsolat</string>
   <string name="unknow_error">Ismeretlen hiba</string>
   <string name="invalid_server_address">Hibás szerver cím</string>
@@ -412,12 +407,9 @@ Email: support@seafile.com<br>
   <string name="saf_failed_to_create_directory">Nem lehet létrehozni a könyvtárat: %s</string>
   <string name="saf_file_exist">A fájl már létezik</string>
   <string name="saf_bad_mime_type">Hibás fájl típus kérés</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">A szerver üres!</string>
   <string name="shib_load_page_error">Hiba:</string>
-  <string name="shib_login_title">Shibboleth belépés</string>
-  <string name="shib_server_hint">Szerver...</string>
-  <string name="shib_actionbar_title">Belépés Shibboleth-tel</string>
   <string name="shib_loading">betöltés...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Hálózati hiba, próbálja meg később!</string>
diff --git a/app/src/main/res/values-is-rIS/strings.xml b/app/src/main/res/values-is-rIS/strings.xml
index df4c375e4..53de22ed6 100644
--- a/app/src/main/res/values-is-rIS/strings.xml
+++ b/app/src/main/res/values-is-rIS/strings.xml
@@ -324,12 +324,9 @@
   <string name="saf_upload_path_not_available">Gat ekki hlaðið upp, engin slóð tiltæk</string>
   <string name="saf_failed_to_create_directory">Gat ekki búið til skráasafnið %s</string>
   <string name="saf_bad_mime_type">Slæm beiðnagerð</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">Þjónn er tómur!</string>
   <string name="shib_load_page_error">Villa:</string>
-  <string name="shib_login_title">Shibboleth Innskráning</string>
-  <string name="shib_server_hint">Settu inn Þjón...</string>
-  <string name="shib_actionbar_title">Skrá inn með Shibboleth</string>
   <string name="shib_loading">er að vinna...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Netkerfis tengivilla, vinsamlegast reyndu aftur síðar!</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
deleted file mode 100644
index b5daefeea..000000000
--- a/app/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="welcome_to_seafile">Benvenuto in Seafile</string>
-  <string name="select_account">Scegli un account per iniziare</string>
-  <string name="edit_account">Modifica</string>
-  <string name="delete_account">Cancella</string>
-  <string name="delete">Cancella</string>
-  <string name="delete_file_f">Cancella file</string>
-  <string name="delete_dir">Cancella cartella</string>
-  <string name="passwd_hint">Password</string>
-  <string name="open_file">Apri</string>
-  <string name="download_file">Scarica</string>
-  <string name="redownload_file">Scarica nuovamente</string>
-  <string name="cancel_download">Annulla</string>
-  <string name="refresh">Aggiorna</string>
-  <string name="add_account">Aggiungi Account</string>
-  <string name="personal">Personale</string>
-  <string name="libraries">Librerie</string>
-  <string name="cached">Cachata</string>
-  <string name="activities">Attività</string>
-  <string name="pick_upload_type">Carica</string>
-  <string name="accounts">Account</string>
-  <string name="settings">Impostazioni</string>
-  <string-array name="pick_upload_array">
-    <item>File</item>
-    <item>Foto/Video</item>
-    <item>Altro</item>
-  </string-array>
-  <string name="choose_server">Scegli un Server Seafile</string>
-  <string name="network_down">Nessun connessione disponibile</string>
-  <string name="invalid_server_address">Indirizzo server non valido</string>
-  <string name="err_login_failed">Login fallito</string>
-  <string name="err_wrong_user_or_passwd">Email o password errati</string>
-  <string name="upload">Carica</string>
-  <string name="uploaded">Caricati</string>
-  <string name="updated">Aggiornati</string>
-  <string name="download_failed">Download fallito</string>
-  <string name="task_cancel">Annulla</string>
-  <string name="task_retry">Riprova</string>
-  <string name="task_remove">Rimuovi</string>
-  <string name="file_action_download">Scarica</string>
-  <string name="file_action_update">Carica</string>
-  <string name="file_action_export">Esporta</string>
-  <string name="file_action_delete">Cancella</string>
-  <string name="file_action_rename">Rinomina</string>
-  <string name="file_action_copy">Copia</string>
-  <string name="file_action_move">Muovi</string>
-  <string name="file_action_open_as">Apri come</string>
-  <string-array name="file_type_array">
-    <item>Testo</item>
-    <item>Audio</item>
-    <item>Video</item>
-    <item>Immagine</item>
-    <item>Altro</item>
-  </string-array>
-  <string name="wait">Attendi</string>
-  <string name="pick_photo_video_title">Scegli foto/video da caricare</string>
-  <string name="dir_name_empty">Inserisci il nome della cartella</string>
-  <string name="file_name_empty">Inserisci il nome del file</string>
-  <string name="password_empty">Inserisci la password</string>
-  <string name="wrong_password">password errata</string>
-  <string name="library_read_only">Questa libreria è sola-lettura</string>
-  <string name="dir_empty">Questa cartella è vuota</string>
-  <string name="no_repo">Non hai ancora librerie</string>
-  <string name="no_app_available">Nessun app trovata</string>
-  <string name="add_to_seafile">Aggiungi a Seafile</string>
-  <string name="ok">OK</string>
-  <string name="choose_an_account">Scegli un account</string>
-  <string name="choose_a_library">Scegli una libreria</string>
-  <string name="load_libraries_fail">Impossibile caricare le librerie</string>
-  <string name="load_dir_fail">Impossibile caricare il contenuto di questa cartella</string>
-  <string name="not_supported_share">Questo tipo di condivisione non è supportato</string>
-  <string name="create_new_file">Crea un nuovo file</string>
-  <string name="create_new_dir">Crea una nuova cartella</string>
-  <string name="camera">Crea una foto qui</string>
-  <string name="download">Scarica</string>
-  <string name="open">Apri</string>
-  <string name="last_modified">ultima modifica</string>
-  <string name="file_modified">modificato</string>
-  <string name="file_size">dimensione file</string>
-  <string name="export_file">Esporta questo file</string>
-  <string name="no_upload_tasks">No ci sono ancora caricamenti attivi</string>
-  <string name="seahub_url_hint">Nota: l\'indirizzo del Server dovrebbe contenere la porta. Per esempio, www.example.com:8000</string>
-  <string name="copy_link">Copia link</string>
-  <string name="share_file_link">Condividi il link al file</string>
-  <string name="share_dir_link">Condividi il link a questa cartella</string>
-  <string name="generating_link">Generazione del link...</string>
-  <string name="link_ready_to_be_pasted">Il link è pronto per essere incollato.</string>
-  <string name="rename_file">Rinomina file</string>
-  <string name="rename_dir">Rinomina cartella</string>
-  <string name="rename_successful">Cambio nome avvenuto correttamente.</string>
-  <string-array name="nav_array">
-    <item>File</item>
-    <item>Caricamenti</item>
-    <item>Account</item>
-    <item>Backup Foto</item>
-  </string-array>
-  <string name="no_starred_file">Non ci sono ancora file preferiti</string>
-  <string name="tabs_library">Librerie</string>
-  <string name="tabs_activity">Attività</string>
-  <string name="tabs_starred">Preferiti</string>
-  <string name="provide_password">Inserisci la password per la libreria \"%s\"</string>
-  <string name="just_now">Appena adesso</string>
-  <string name="open_as">Apri come</string>
-  <string name="storage_removed">La memoria è stata rimossa</string>
-  <string name="error_selecting_file">Errore nella selezione del file</string>
-  <string name="empty_folder">Cartella vuota</string>
-  <string name="choose_file">Scegli un file</string>
-  <string name="ssl_confirm">Il certificato di sicurezza di %s non è fidato. Vuoi continuare?</string>
-  <string name="ssl_confirm_title">Connessione Insicura</string>
-  <string name="yes">Sì</string>
-  <string name="no">No</string>
-  <string name="remember_my_choice">Ricorda la mia scelta</string>
-  <string name="internal_server_error">Errore Interno del Server</string>
-  <string name="copy_file_ing">Copia file in corso</string>
-  <string name="move_file_ing">Spostamento file in corso</string>
-  <string name="copy_folder_ing">Copia cartella in corso</string>
-  <string name="move_folder_ing">Spostamento cartella in corso</string>
-  <string name="cannot_copy_folder_to_subfolder">Non puoi copiare una cartella in una sua sottocartella</string>
-  <string name="cannot_move_folder_to_subfolder">Non puoi spostare una cartella in una sua sottocartella</string>
-  <string name="cancel">Annulla</string>
-  <string name="confirm">Conferma</string>
-  <string name="security">Sicurezza</string>
-  <string name="gesture_lock">Movimento per Blocco</string>
-  <string name="gesture_lock_on">Movimento blocco attivo</string>
-  <string name="gesture_lock_off">Movimento blocco disattivo</string>
-  <string name="lockscreen_access_pattern_cleared">Pattern pulito</string>
-  <!--Strings for possible PreferenceActivity Back/Next buttons-->
-  <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
-  <!--contacts  upload-->
-  <!--contacts Upload Perference-->
-  <!--Camera Upload Preference-->
-  <string name="settings_camera_upload_info_title">Caricamento Foto di Fotocamera</string>
-  <!--Camera Upload Configuration View-->
-  <!--Camera Sync-->
-  <!--pull to refresh-->
-  <!--storage access framework-->
-  <!--shibboleth SSO-->
-  <!--Transfer List-->
-  <!--Sort-->
-  <!--Search-->
-  <!--star a file-->
-  <!--unstar a file-->
-  <!--notification bar-->
-  <!--Gallery-->
-  <!--Overwrite existing files-->
-  <!--Action Mode-->
-  <!--Accessibility description for navigation drawer-->
-  <!--permission-->
-  <!--client side encryption and decryption-->
-  <!--clear password-->
-  <!--Two factor auth-->
-  <!--Operation Exceptions-->
-  <!--Home list title-->
-</resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index ac94c041d..d4ba16d1f 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -41,11 +41,6 @@
     <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>
@@ -411,13 +406,10 @@
   <string name="saf_failed_to_create_directory">ディレクトリー %s を作成できません</string>
   <string name="saf_file_exist">ファイルはすでに存在します</string>
   <string name="saf_bad_mime_type">リクエストタイプが不正</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">サーバーは空です!</string>
   <string name="shib_server_incorrect_prefix">サーバーは https:// で始まる必要があります</string>
   <string name="shib_load_page_error">エラー: </string>
-  <string name="shib_login_title">Shibboleth ログイン</string>
-  <string name="shib_server_hint">サーバーを入力...</string>
-  <string name="shib_actionbar_title">Shibboleth でログイン</string>
   <string name="shib_loading">読み込み中…</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">ネットワーク接続エラー。後で再度実行してください!</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index dc6cdcdfd..c038a4d26 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -41,11 +41,6 @@
     <item>기타</item>
   </string-array>
   <string name="choose_server">Seafile 서버를 선택하세요</string>
-  <string-array name="choose_server_array">
-    <item>SeaCloud.cc</item>
-    <item>시볼레스 로그인</item>
-    <item>다른 Seafile 서버</item>
-  </string-array>
   <string name="network_down">네트워크 연결 상태가 아닙니다</string>
   <string name="unknow_error">알 수 없는 오류</string>
   <string name="invalid_server_address">잘못된 서버 주소입니다</string>
@@ -408,12 +403,9 @@
   <string name="saf_failed_to_create_directory">%s 디렉터리를 만들 수 없습니다</string>
   <string name="saf_file_exist">파일이 이미 있습니다</string>
   <string name="saf_bad_mime_type">잘못된 요청 형식입니다</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">서버가 비어있습니다!</string>
   <string name="shib_load_page_error">오류:</string>
-  <string name="shib_login_title">Shibboleth 로그인</string>
-  <string name="shib_server_hint">입력 서버...</string>
-  <string name="shib_actionbar_title">Shibboleth 로그인</string>
   <string name="shib_loading">불러오는 중...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">네트워크 연결에 문제가 있으니, 나중에 다시 해보세요!</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
deleted file mode 100644
index f6dac1e48..000000000
--- a/app/src/main/res/values-lv/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!--Strings for possible PreferenceActivity Back/Next buttons-->
-  <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
-  <!--contacts  upload-->
-  <!--contacts Upload Perference-->
-  <!--Camera Upload Preference-->
-  <!--Camera Upload Configuration View-->
-  <!--Camera Sync-->
-  <!--pull to refresh-->
-  <!--storage access framework-->
-  <!--shibboleth SSO-->
-  <!--Transfer List-->
-  <!--Sort-->
-  <!--Search-->
-  <!--star a file-->
-  <!--unstar a file-->
-  <!--notification bar-->
-  <!--Gallery-->
-  <!--Overwrite existing files-->
-  <!--Action Mode-->
-  <!--Accessibility description for navigation drawer-->
-  <!--permission-->
-  <!--client side encryption and decryption-->
-  <!--clear password-->
-  <!--Two factor auth-->
-  <!--Operation Exceptions-->
-  <!--Home list title-->
-</resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 2509afeb8..37cd7546e 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -307,12 +307,9 @@
   <string name="saf_upload_path_not_available">Klarte ikke å laste opp. Ingen tilgjengelig sti.</string>
   <string name="saf_failed_to_create_directory">Kunne ikke opprette mappe %s</string>
   <string name="saf_bad_mime_type">Feil forespørselstype</string>
-  <!--shibboleth SSO-->
+  <!--Single sign on SSO-->
   <string name="shib_server_url_empty">Serveren er tom!</string>
   <string name="shib_load_page_error">Feil: </string>
-  <string name="shib_login_title">Logg inn med Shibboleth</string>
-  <string name="shib_server_hint">Skriv inn server...</string>
-  <string name="shib_actionbar_title">Logg inn med Shibboleth</string>
   <string name="shib_loading">laster...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Nettverkstilkoblingsfeil. Prøv igjen senere!</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 8b30620a3..767e02b54 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -41,11 +41,6 @@
     <item>Overig</item>
   </string-array>
   <string name="choose_server">Kies een Seafile server</string>
-  <string-array name="choose_server_array">
-    <item>SeaCloud.cc</item>
-    <item>Aanmelden Shibboleth</item>
-    <item>Andere Seafile-server</item>
-  </string-array>
   <string name="network_down">Geen netwerkverbinding</string>
   <string name="unknow_error">Onbekende fout</string>
   <string name="invalid_server_address">Ongeldig serveradres</string>
@@ -375,12 +370,9 @@
   <string name="saf_failed_to_create_directory">Kon map %s niet aanmaken</string>
   <string name="saf_file_exist">Dat bestand bestaat reeds</string>
   <string name="saf_bad_mime_type">Verkeerd type verzoek</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">Server is leeg!</string>
   <string name="shib_load_page_error">Fout:</string>
-  <string name="shib_login_title">Shibboleth Inlog</string>
-  <string name="shib_server_hint">Invoer server…</string>
-  <string name="shib_actionbar_title">Aanmelden met Shibboleth</string>
   <string name="shib_loading">laden...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Fout bij netwerkverbinding. Probeer het later opnieuw!</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 1c87c11fb..ff40cb22b 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -41,11 +41,6 @@
     <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>
@@ -426,13 +421,10 @@
   <string name="saf_failed_to_create_directory">Nie można utworzyć folderu %s</string>
   <string name="saf_file_exist">Ten plik już istnieje</string>
   <string name="saf_bad_mime_type">Zły typ żądania</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">Serwer jest pusty!</string>
   <string name="shib_server_incorrect_prefix">Nazwa serwera musi się zaczynać od https://</string>
   <string name="shib_load_page_error">Błąd:</string>
-  <string name="shib_login_title">Logowanie Shibboleth</string>
-  <string name="shib_server_hint">Serwer wejściowy...</string>
-  <string name="shib_actionbar_title">Zaloguj z Shibboleth</string>
   <string name="shib_loading">wczytywanie...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Błąd połączenia sieciowego, proszę spróbować później!</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 38365786e..68ca359fd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -273,12 +273,9 @@
   <string name="saf_upload_path_not_available">Não é possível carregar, nenhum caminho disponível</string>
   <string name="saf_failed_to_create_directory">Não foi possível criar o diretório %s</string>
   <string name="saf_bad_mime_type">Tipo de requisição invalido</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">O Servidor esta vazio</string>
   <string name="shib_load_page_error">Erro:</string>
-  <string name="shib_login_title">Shibboleth Login</string>
-  <string name="shib_server_hint">Servidor de entrada...</string>
-  <string name="shib_actionbar_title">Login com Shibboleth</string>
   <string name="shib_loading">carregando...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Erro de conexão com internet, por favor tente novamente mais tarde</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d881d1831..2b618433f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,11 +41,6 @@
     <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>
@@ -426,13 +421,10 @@
   <string name="saf_failed_to_create_directory">Не возможно создать папку %s</string>
   <string name="saf_file_exist">Файл уже существует</string>
   <string name="saf_bad_mime_type">Неправильный тип ответа</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">Сервер пуст!</string>
   <string name="shib_server_incorrect_prefix">Адрес сервера должен начинаться с https://</string>
   <string name="shib_load_page_error">Ошибка:</string>
-  <string name="shib_login_title">Вход через Shibboleth</string>
-  <string name="shib_server_hint">Введите сервер...</string>
-  <string name="shib_actionbar_title">Войти с помощью Shibboleth</string>
   <string name="shib_loading">загрузка...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Ошибка подключения к сети, пожалуйста, повторите позже!</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index dc510a29f..efd42a9c9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -179,10 +179,8 @@
   <string name="pull_to_refresh_refreshing_label">Yükleniyor...</string>
   <!--storage access framework-->
   <string name="saf_file_not_cached_exception">%s dosyası ön belleklenmemiş</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">Sunucu boş!</string>
-  <string name="shib_login_title">Shibboleth Girişi</string>
-  <string name="shib_actionbar_title">Shibboleth ile giriş yap</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">Ağ bağlantı hatası, lütfen daha sonra tekrar deneyin!</string>
   <string name="transfer_tabs_downloads">Listeyi indir</string>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
deleted file mode 100644
index f6dac1e48..000000000
--- a/app/src/main/res/values-ug/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!--Strings for possible PreferenceActivity Back/Next buttons-->
-  <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
-  <!--contacts  upload-->
-  <!--contacts Upload Perference-->
-  <!--Camera Upload Preference-->
-  <!--Camera Upload Configuration View-->
-  <!--Camera Sync-->
-  <!--pull to refresh-->
-  <!--storage access framework-->
-  <!--shibboleth SSO-->
-  <!--Transfer List-->
-  <!--Sort-->
-  <!--Search-->
-  <!--star a file-->
-  <!--unstar a file-->
-  <!--notification bar-->
-  <!--Gallery-->
-  <!--Overwrite existing files-->
-  <!--Action Mode-->
-  <!--Accessibility description for navigation drawer-->
-  <!--permission-->
-  <!--client side encryption and decryption-->
-  <!--clear password-->
-  <!--Two factor auth-->
-  <!--Operation Exceptions-->
-  <!--Home list title-->
-</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index be3f47a12..305d50550 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -12,7 +12,7 @@
   <string name="delete_file_f">删除文件</string>
   <string name="delete_dir">删除文件夹</string>
   <string name="name_hint">名称</string>
-  <string name="server_hint">服务器地址</string>
+  <string name="server_hint">云盘网址</string>
   <string name="email_hint">邮箱或用户名</string>
   <string name="passwd_hint">密码</string>
   <string name="passwd_min_len_limit_hint">密码(至少%d个字符)</string>
@@ -43,7 +43,7 @@
   <string name="choose_server">请选择一个Seafile服务器</string>
   <string-array name="choose_server_array">
     <item>SeaCloud.cc</item>
-    <item>Shibboleth登录</item>
+    <item>统一登录</item>
     <item>其他Seafile服务器</item>
   </string-array>
   <string name="network_down">无网络连接</string>
@@ -415,13 +415,11 @@
   <string name="saf_failed_to_create_directory">无法创建目录%s</string>
   <string name="saf_file_exist">该文件已存在</string>
   <string name="saf_bad_mime_type">请求类型错误</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">地址栏为空</string>
   <string name="shib_server_incorrect_prefix">服务器地址需要以 https:// 开头</string>
   <string name="shib_load_page_error">错误：</string>
-  <string name="shib_login_title">Shibboleth登录</string>
-  <string name="shib_server_hint">请输入地址...</string>
-  <string name="shib_actionbar_title">Shibboleth登录</string>
+  <string name="shib_login_title">统一登录</string>
   <string name="shib_loading">加载中...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">网络连接错误，请稍后重试！</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f7609227e..d077cc92a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -41,11 +41,6 @@
     <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>
@@ -385,12 +380,9 @@
   <string name="saf_failed_to_create_directory">無法創建目錄%s</string>
   <string name="saf_file_exist">該文件已存在</string>
   <string name="saf_bad_mime_type">請求類型錯誤</string>
-  <!--shibboleth SSO-->
+  <!--Single Sign-On SSO-->
   <string name="shib_server_url_empty">地址欄為空</string>
   <string name="shib_load_page_error">錯誤：</string>
-  <string name="shib_login_title">Shibboleth登錄</string>
-  <string name="shib_server_hint">請輸入地址...</string>
-  <string name="shib_actionbar_title">Shibboleth登錄</string>
   <string name="shib_loading">加載中...</string>
   <!--Transfer List-->
   <string name="transfer_list_network_error">網絡連接錯誤，請稍後重試！</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
deleted file mode 100644
index f6dac1e48..000000000
--- a/app/src/main/res/values-zh/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!--Strings for possible PreferenceActivity Back/Next buttons-->
-  <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
-  <!--contacts  upload-->
-  <!--contacts Upload Perference-->
-  <!--Camera Upload Preference-->
-  <!--Camera Upload Configuration View-->
-  <!--Camera Sync-->
-  <!--pull to refresh-->
-  <!--storage access framework-->
-  <!--shibboleth SSO-->
-  <!--Transfer List-->
-  <!--Sort-->
-  <!--Search-->
-  <!--star a file-->
-  <!--unstar a file-->
-  <!--notification bar-->
-  <!--Gallery-->
-  <!--Overwrite existing files-->
-  <!--Action Mode-->
-  <!--Accessibility description for navigation drawer-->
-  <!--permission-->
-  <!--client side encryption and decryption-->
-  <!--clear password-->
-  <!--Two factor auth-->
-  <!--Operation Exceptions-->
-  <!--Home list title-->
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8f9b353d5..8acb441cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,7 +47,7 @@
     <string name="choose_server">Choose a Seafile Server</string>
     <string-array name="choose_server_array">
         <item>SeaCloud.cc</item>
-        <item>Shibboleth Login</item>
+        <item>Single Sign-On</item>
         <item>Other Seafile Server</item>
     </string-array>
     <string name="server_url_seacloud" translatable="false">https://seacloud.cc</string>
@@ -452,13 +452,11 @@
     <string name="saf_file_exist">That file already exists</string>
     <string name="saf_bad_mime_type">Bad request type</string>
 
-    <!-- shibboleth SSO -->
+    <!-- Single Sign-On  SSO -->
     <string name="shib_server_url_empty">Server is empty!</string>
     <string name="shib_server_incorrect_prefix">Server needs to start with https://</string>
     <string name="shib_load_page_error">Error:&#160;</string>
-    <string name="shib_login_title">Shibboleth Login</string>
-    <string name="shib_server_hint">Input server&#8230;</string>
-    <string name="shib_actionbar_title">Login with Shibboleth</string>
+    <string name="shib_login_title">Single Sign-On</string>
     <string name="shib_loading">loading&#8230;</string>
 
     <!-- Transfer List -->