drop ContactSync feature

OpenKeychain/src/main/res/values-ar/strings.xml

@@ -178,8 +178,7 @@
   <string name="label_sync_settings_contacts_title">ربط المفاتيح بجهات الإتصال</string>
   <string name="label_sync_settings_contacts_summary_off">لن يتم ربط المفاتيح الجديدة بجهات الإتصال</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">تحديثات تلقائية للمفاتيح</string>
-  <string name="label_experimental_settings_desc_title">تحذير</string>
+    <string name="label_experimental_settings_desc_title">تحذير</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">فعّل تور</string>
   <string name="pref_proxy_tor_summary">يتطلب نتصيب تطبيق أوربوت</string>

OpenKeychain/src/main/res/values-ca/strings.xml

@@ -208,7 +208,6 @@
   <string name="label_sync_settings_contacts_summary_on">Enllaça claus amb contactes basant-se amb noms i adreces de correu. Això succeeix completament fora de línia en el vostre dispositiu.</string>
   <string name="label_sync_settings_contacts_summary_off">Les noves claus no s\'enllaçaran amb els contactes</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Actualització de claus automàticament</string>
   <string name="label_experimental_settings_desc_title">Advertència</string>
   <string name="label_experimental_settings_keybase_title">Proves de Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Contacta amb keybase.io per proves de clau i mostra-les cada vegada que es mostri una clau</string>

OpenKeychain/src/main/res/values-cs/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">Protojit klíče s kontakty na základě jmen a emailových adres. Odehrává se kompletně offline na vašem zařízení.</string>
   <string name="label_sync_settings_contacts_summary_off">Nové klíče nebudou propojeny s kontakty</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automaticky aktualizovat klíč</string>
   <string name="label_experimental_settings_desc_title">Varovnání</string>
   <string name="label_experimental_settings_desc_summary">Tyto funkce nejsou ještě dokončené nebo neprošli uživatelským testováním/bezpečnostním auditem. Prosím, nespoléhejte na jejich zabezpečení a nehlašte problémy s nimi spojené, pokud na ně narazíte.</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io Proofs</string>

OpenKeychain/src/main/res/values-de/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">Schlüssel basierend auf Namen und E-Mail-Adressen mit Kontakten verknüpfen. Das alles findet komplett offline auf deinem Gerät statt.</string>
   <string name="label_sync_settings_contacts_summary_off">Neue Schlüssel werden nicht mit Kontakten verknüpft</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatische Schlüsselaktualisierung</string>
   <string name="label_experimental_settings_desc_title">Warnung</string>
   <string name="label_experimental_settings_desc_summary">Diese Funktionen sind noch nicht final oder das Ergebnis von Benutzererfahrungs-/Sicherheitsuntersuchungen. Verlasse dich daher nicht auf deren Sicherheit und melde uns bitte keine auftretenden Probleme!</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io-Nachweise</string>

OpenKeychain/src/main/res/values-es-rMX/strings.xml

@@ -210,8 +210,7 @@
   <string name="label_sync_settings_contacts_summary_on">Vincular claves a contactos basándose en nombres y direcciones de correo electrónico. Esto ocurre sin conexión completamente en tu dispositivo.</string>
   <string name="label_sync_settings_contacts_summary_off">Nuevas claves no serán vinculadas a contactos</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Actualizaciones automáticas de claves</string>
-  <string name="label_experimental_settings_desc_title">Advertencia</string>
+    <string name="label_experimental_settings_desc_title">Advertencia</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">Activar Tor</string>
   <string name="pref_proxy_tor_summary">Requiere Orbot instalado</string>

OpenKeychain/src/main/res/values-es/strings.xml

@@ -212,8 +212,7 @@
   <string name="label_sync_settings_contacts_summary_on">Vincula claves con contactos basándose en nombres y direcciones de correo electrónico. Esto sucede con su dispositivo completamente desconectado.</string>
   <string name="label_sync_settings_contacts_summary_off">Las claves nuevas no se vincularán a contactos</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Actualizaciones automáticas de claves</string>
-  <string name="label_experimental_settings_desc_title">Advertencia</string>
+    <string name="label_experimental_settings_desc_title">Advertencia</string>
   <string name="label_experimental_settings_desc_summary">Estas características todavía no están finalizadas o no se han obtenido los resultados de experiencia del usuario y la investigación de seguridad. Por tanto, no confíe en su seguridad y, por favor, ¡no informe de los problemas que encuentre!</string>
   <string name="label_experimental_settings_keybase_title">Comprobantes de Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Contacta con keybase.io para obtener comprobantes de clave y muestrelos cada vez que se muestra una clave</string>

OpenKeychain/src/main/res/values-eu/strings.xml

@@ -206,8 +206,7 @@
   <string name="label_sync_settings_contacts_summary_on">Lotu giltzak harremanekin izen eta post@ helbideetan ohinarrituz. Hau erabat lineaz-kanpo gertatzen da zure gailuan.</string>
   <string name="label_sync_settings_contacts_summary_off">Giltza berriak ez dira harremanekin lotuko</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Berezgaitasunez eguneratu giltzak</string>
-  <string name="label_experimental_settings_desc_title">Kontuz</string>
+    <string name="label_experimental_settings_desc_title">Kontuz</string>
   <string name="label_experimental_settings_desc_summary">Ezaugarri hauek ez dute amaitu edo erabiltzaile jarduera/segurtasun emaitzak erdietsita. Honela, ez dira beren segurtasunean ohinarritzen eta mesedez ez jakinarazi aurkitzen dituzun arazoak!</string>
   <string name="label_experimental_settings_keybase_summary">Jarri harremanetan keybase.io giltzak probatzeko eta erakutsi hauek giltza bat erakusten den bakoitzean</string>
   <string name="label_experimental_settings_theme_summary">(Ikurrak eta ikusleiho asko oraindik ez daude azalgai ilunarekin zehaztuta)</string>

OpenKeychain/src/main/res/values-fr/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">Relier les clés aux contacts d’après les noms et les adresses courriel. Cela se passe entièrement hors ligne sur votre appareil.</string>
   <string name="label_sync_settings_contacts_summary_off">Les nouvelles clés ne seront pas reliées aux contacts</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Mises à jour automatiques des clés</string>
   <string name="label_experimental_settings_desc_title">Avertissement</string>
   <string name="label_experimental_settings_desc_summary">Ces fonctions ne sont pas encore terminées et n’ont pas fait l’objet de recherche sur leur convivialité ni leur sécurité. Par conséquent, ne vous fiez pas à leur sécurité et veuillez ne pas signaler les problèmes que vous rencontrez.</string>
   <string name="label_experimental_settings_keybase_title">Preuves keybase.io</string>

OpenKeychain/src/main/res/values-gl/strings.xml

@@ -211,8 +211,7 @@
   <string name="label_sync_settings_contacts_summary_on">Ligar chaves a contactos baseándose en nomes e enderezos de correo electrónico. Isto acontece sen precisar conexión a rede no seu dispositivo.</string>
   <string name="label_sync_settings_contacts_summary_off">As novas chaves non se ligarán aos contactos</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Actualización automática de chaves</string>
-  <string name="label_experimental_settings_desc_title">Aviso</string>
+    <string name="label_experimental_settings_desc_title">Aviso</string>
   <string name="label_experimental_settings_desc_summary">Estas características aínda non están rematadas ou son resultado da investigación da experiencia de usuaria e/ou seguridade. Xa que logo, non confíe na súa seguridade e por favor non informe sobre os fallos que poida atopar!</string>
   <string name="label_experimental_settings_keybase_title">probas de Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Pedirlle probas de chave a keybase.io e expoñelas cada vez que se mostra a chave</string>

OpenKeychain/src/main/res/values-hu/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">Kulcsok összekapcsolása partnerekkel a nevük és az e-mail címük alapján. Ez teljesen mértékben hálózati kapcsolat nélkül történik az ön eszközén.</string>
   <string name="label_sync_settings_contacts_summary_off">Az új kulcsok nem lesznek összekapcsolva partnerekkel</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatikus kulcsfrissítések</string>
   <string name="label_experimental_settings_desc_title">Figyelmeztetés</string>
   <string name="label_experimental_settings_desc_summary">Ezek a funkciók még nincsenek befejezve, vagy felhasználói élmény és biztonsági kutatást eredményei. Emiatt ne bízzon a biztonságukban, és ne jelentse a felmerülő hibákat!</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io igazolások</string>

OpenKeychain/src/main/res/values-it/strings.xml

@@ -194,8 +194,7 @@
   <string name="label_sync_settings_contacts_summary_on">Collega le chiavi ai contatti in base ai nomi e indirizzi email. Ciò avviene completamente offline sul tuo dispositivo.</string>
   <string name="label_sync_settings_contacts_summary_off">Le chiavi nuove non verranno collegate ai contatti</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Aggiornamenti automatici delle chiavi</string>
-  <string name="label_experimental_settings_desc_title">Attenzione</string>
+    <string name="label_experimental_settings_desc_title">Attenzione</string>
   <string name="label_experimental_settings_desc_summary">Queste funzioni non sono ancora finite o testate da utenti/ricerche di sicurezza. Perciò non contare sulla loro sicurezza e per favore non segnalare i problemi che riscontri!</string>
   <string name="label_experimental_settings_keybase_summary">Contatta keybase.io per avere prove e mostrale ogni volta che visualizzo una chiave</string>
   <string name="label_experimental_settings_theme_summary">(Le icone e molte schermate non sono ancora modificate correttamente per il tema scuro)</string>

OpenKeychain/src/main/res/values-ja/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">オフランで完結して、名前とメールアドレスに基づいて、鍵を連絡先にリンク</string>
   <string name="label_sync_settings_contacts_summary_off">新しい鍵は連絡先と関連付けしない</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">鍵の自動アップデート</string>
   <string name="label_experimental_settings_desc_title">注意</string>
   <string name="label_experimental_settings_desc_summary">これらの機能はまだ完成していないか、ユーザーエクスペリエンス/セキュリティ研究の結果ではありません。そのため、このセキュリティに依存したり、遭遇した問題を報告しないでください!</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io 検証</string>

OpenKeychain/src/main/res/values-ko/strings.xml

@@ -202,8 +202,7 @@
   <string name="label_sync_settings_contacts_summary_on">이름과 이메일 주소에 기초해 키를 연락처에 연결합니다. 이 작업은 완전히 오프라인에서만 수행됩니다.</string>
   <string name="label_sync_settings_contacts_summary_off">새 키를 앞으로 연락처에 연결하지 않음</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">자동 키 갱신</string>
-  <string name="label_experimental_settings_desc_title">경고</string>
+    <string name="label_experimental_settings_desc_title">경고</string>
   <string name="label_experimental_settings_desc_summary">이 기능들은 아직 완성되지 않았거나 유저 경험/보안 연구의 결과가 아닙니다. 그러니 이 기능의 보안성에 의존하거나 겪는 문제를 보고하지 말아주세요!</string>
   <string name="label_experimental_settings_keybase_summary">keybase.io에 연결해서 키가 표시될 때 마다 키 증명을 표시</string>
   <string name="label_experimental_settings_theme_summary">(아이콘이나 많은 화면이 검은 테마에 알맞게 아직 조정되지 않았습니다)</string>

OpenKeychain/src/main/res/values-nb/strings.xml

@@ -202,8 +202,7 @@
   <string name="label_sync_settings_contacts_summary_on">Lenk nøkler til kontakter basert på navn og e-postadresser. Dette skjer helt frakoblet på din enhet.</string>
   <string name="label_sync_settings_contacts_summary_off">Nye nøkler vil ikke lenkes til kontakter</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatiske nøkkeloppdateringer</string>
-  <string name="label_experimental_settings_desc_title">Advarsel</string>
+    <string name="label_experimental_settings_desc_title">Advarsel</string>
   <string name="label_experimental_settings_desc_summary">Disse funksjonene er ikke ferdige enda, eller resultat av brukererfaring/sikkerhetsforskning. Som sådan, bør du ikke stole på at de er sikre, og ikke rapportere feil du kommer over!</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io-bevis</string>
   <string name="label_experimental_settings_keybase_summary">Kontakt keybase.io for nøkkelbevis og vis dem hver gang en nøkkel vises</string>

OpenKeychain/src/main/res/values-nl-rBE/strings.xml

@@ -212,8 +212,7 @@
   <string name="label_sync_settings_contacts_summary_on">Koppel sleutels aan contacten gebaseerd op namen en e-mailadressen. Dit gebeurt volledig offline op je apparaat.</string>
   <string name="label_sync_settings_contacts_summary_off">Nieuwe sleutels zullen niet worden gekoppeld aan contacten</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatische sleutelupdates</string>
-  <string name="label_experimental_settings_desc_title">Waarschuwing</string>
+    <string name="label_experimental_settings_desc_title">Waarschuwing</string>
   <string name="label_experimental_settings_desc_summary">Deze functies zijn nog niet afgewerkt of zijn resultaten van gebruikerservaringen/beveiligingsonderzoek. Vertrouw daarom niet op hun beveiliging en rapporteer geen problemen die je ervaart!</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io-bewijzen</string>
   <string name="label_experimental_settings_keybase_summary">Maak contact met keybase.io voor bevestigingen van sleutels en toon deze telkens wanneer een sleutel wordt weergegeven</string>

OpenKeychain/src/main/res/values-nl/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">Koppel sleutels aan contacten gebaseerd op namen en e-mailadressen. Dit gebeurt volledig offline op je apparaat.</string>
   <string name="label_sync_settings_contacts_summary_off">Nieuwe sleutels zullen niet worden gekoppeld aan contacten</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatische sleutelupdates</string>
   <string name="label_experimental_settings_desc_title">Waarschuwing</string>
   <string name="label_experimental_settings_desc_summary">Deze functies zijn nog niet afgewerkt of zijn resultaten van gebruikerservaringen/beveiligingsonderzoek. Vertrouw daarom niet op hun beveiliging en rapporteer geen problemen die je ervaart!</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io-bewijzen</string>

OpenKeychain/src/main/res/values-pl/strings.xml

@@ -212,8 +212,7 @@
   <string name="label_sync_settings_contacts_summary_on">Połącz klucze z kontaktami używając nazw i adresów e-mail. Ta operacja jest wykonywana offline wyłączenie na tym urządzeniu.</string>
   <string name="label_sync_settings_contacts_summary_off">Nowe klucze nie będą połączone z kontaktami</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatyczne aktualizacje kluczy</string>
-  <string name="label_experimental_settings_desc_title">Ostrzeżenie</string>
+    <string name="label_experimental_settings_desc_title">Ostrzeżenie</string>
   <string name="label_experimental_settings_desc_summary">Te funkcje nie są jeszcze skończone lub są wynikiem badań bezpieczeństwa / wrażeń użytkownika. Tak więc nie polegaj na ich bezpieczeństwie i nie zgłaszaj problemów z nimi związanych!</string>
   <string name="label_experimental_settings_keybase_title">Dowody keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Sprawdź keybase.io dla dowodów kluczy i pokaż je za każdym razem kiedy klucz jest wyświetlany</string>

OpenKeychain/src/main/res/values-pt-rBR/strings.xml

@@ -212,8 +212,7 @@
   <string name="label_sync_settings_contacts_summary_on">Vincula chaves a contatos com base em nomes e endereços de email. Isto acontece completamente off-line em seu dispositivo.</string>
   <string name="label_sync_settings_contacts_summary_off">Novas chaves não serão vinculadas aos contatos</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Atualização automática de chaves</string>
-  <string name="label_experimental_settings_desc_title">Aviso</string>
+    <string name="label_experimental_settings_desc_title">Aviso</string>
   <string name="label_experimental_settings_desc_summary">Esses recursos ainda não estão finalizados ou resultam de pesquisas de experiência/segurança do usuário. Dessa forma, não confie em sua segurança e, por favor, não relate problemas que encontre!</string>
   <string name="label_experimental_settings_keybase_title">Provas Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Contate o keybase.io para as provas de chaves e mostre-as toda vez que uma chave for exibida</string>

OpenKeychain/src/main/res/values-ru/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">Связывать ключи с контактами основываясь на именах и адресах электронной почты. Это происходит полностью в автономном режиме на вашем устройстве.</string>
   <string name="label_sync_settings_contacts_summary_off">Новые ключи не будут связаны с контактами</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Автообновление ключей</string>
   <string name="label_experimental_settings_desc_title">Предупреждение</string>
   <string name="label_experimental_settings_desc_summary">Эти новые возможности ещё не закончены и/или пока только изучаются. Проще говоря, не стоит полагаться на их безопасность. Пожалуйста, не сообщайте о связанных с ними проблемах!</string>
   <string name="label_experimental_settings_keybase_title">Подтверждение Keybase.io </string>

OpenKeychain/src/main/res/values-sr/strings.xml

@@ -188,8 +188,7 @@
   <string name="label_sync_settings_contacts_summary_on">Повезивање кључева са контактима на основу имена и е-адреса. Одвија се у потпуности ван везе на вашем уређају.</string>
   <string name="label_sync_settings_contacts_summary_off">Нови кључеви неће бити повезани са контактима</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Аутоматско ажурирање кључева</string>
-  <string name="label_experimental_settings_desc_title">Упозорење</string>
+    <string name="label_experimental_settings_desc_title">Упозорење</string>
   <string name="label_experimental_settings_desc_summary">Ове функције још нису завршене или су резултат истраживања корисничког искуства и безбедности. Стога се не ослањајте на њихову безбедност и молимо вас да не пријављујете грешке на које наиђете!</string>
   <string name="label_experimental_settings_keybase_summary">Тражење доказа кључева на keybase.io и њихов приказ приликом приказивања кључа</string>
   <string name="label_experimental_settings_theme_summary">(Иконе и многи екрани још нису прилагођени за тамну тему)</string>

OpenKeychain/src/main/res/values-sv/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">Länka nycklar till kontakter baserade på namn och e-postadresser. Detta sker helt offline på enheten.</string>
   <string name="label_sync_settings_contacts_summary_off">Nya nycklar kommer inte att kopplas till kontakter</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Automatiska nyckeluppdateringar</string>
   <string name="label_experimental_settings_desc_title">Varning</string>
   <string name="label_experimental_settings_desc_summary">Dessa funktioner är ännu inte färdiga eller resultat av användarupplevelse/säkerhetsforskning. Lita därför inte på deras säkerhet och var snäll och rapportera inte problem du stöter på!</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io proofs</string>

OpenKeychain/src/main/res/values-uk/strings.xml

@@ -212,8 +212,7 @@
   <string name="label_sync_settings_contacts_summary_on">Прив\'язувати ключі до контактів на основі імен та адрес електронної пошти. Це відбувається повністю локально на Вашому пристрої.</string>
   <string name="label_sync_settings_contacts_summary_off">Нові ключі не будуть прив\'язані до контактів</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Автоматичне оновлення ключів</string>
-  <string name="label_experimental_settings_desc_title">Попередження</string>
+    <string name="label_experimental_settings_desc_title">Попередження</string>
   <string name="label_experimental_settings_desc_summary">Ці можливості ще в розробці. Будь ласка, не сподівайтесь на їх безпеку та не повідомляйте про проблеми їхнього використання!</string>
   <string name="label_experimental_settings_keybase_title">Перевірки Keybase.io</string>
   <string name="label_experimental_settings_keybase_summary">Контактувати з keybase.io для підтвердження ключа та показувати дійсності щоразу, коли ключ відображено</string>

OpenKeychain/src/main/res/values-vi/strings.xml

@@ -189,8 +189,7 @@
   <string name="label_sync_settings_contacts_summary_on">Liên kết khóa với danh bạ dựa trên tên và địa chỉ thư. Nó được thực hiện hoàn toàn ngoại tuyến trên thiết bị của bạn.</string>
   <string name="label_sync_settings_contacts_summary_off">Các khóa mới sẽ không được liên kết với danh bạ</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">Cập nhật khóa tự động</string>
-  <string name="label_experimental_settings_desc_title">Cảnh báo</string>
+    <string name="label_experimental_settings_desc_title">Cảnh báo</string>
   <string name="label_experimental_settings_desc_summary">Tính năng này hiện chưa được hoàn thành hoặc chỉ mới là kết quả nghiên cứu/thử nghiệm. Do vậy, bạn đừng tin cậy vào tính an toàn của chúng cũng như không cần thiết phải thông báo với chúng tôi!</string>
   <string name="label_experimental_settings_keybase_summary">Liên hệ với keybase.io để minh chứng khóa và hiển thị chúng mỗi khi khóa được gọi</string>
   <string name="label_experimental_settings_theme_summary">(Các biểu tượng và nhiều màn hình không được thêm vào giao diện dạng tối)</string>

OpenKeychain/src/main/res/values-zh-rTW/strings.xml

@@ -213,8 +213,7 @@
   <string name="label_sync_settings_contacts_summary_on">連接金鑰至聯絡人(基於姓名和電子郵件地址)。這只在您的裝置上離線進行。</string>
   <string name="label_sync_settings_contacts_summary_off">新的金鑰將不會與聯絡人連接</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">自動金鑰同步</string>
-  <string name="label_experimental_settings_desc_title">警告</string>
+    <string name="label_experimental_settings_desc_title">警告</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io 證明</string>
     <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">啟用洋蔥(Tor)網路</string>

OpenKeychain/src/main/res/values-zh/strings.xml

@@ -212,7 +212,6 @@
   <string name="label_sync_settings_contacts_summary_on">根据名字和邮件地址将密钥关联到联系人。这是本地操作，不需要设备联网。</string>
   <string name="label_sync_settings_contacts_summary_off">新密钥将不会与联系人相关联</string>
   <!--label shown in Android settings under the OpenKeychain account-->
-  <string name="keyserver_sync_settings_title">自动更新密钥</string>
   <string name="label_experimental_settings_desc_title">警告</string>
   <string name="label_experimental_settings_desc_summary">这些功能目前尚未完成或者缺少用户经验性/安全性的研究结果。所以，不保证他们是安全的，请不要报告遇到的问题！</string>
   <string name="label_experimental_settings_keybase_title">Keybase.io 证明</string>

OpenKeychain/src/main/res/values/strings.xml

@@ -220,11 +220,6 @@
     <string name="label_sync_settings_keyserver_summary_on">"Every three days, keys are updated from the preferred keyserver"</string>
     <string name="label_sync_settings_keyserver_summary_off">"Keys are not automatically updated"</string>
     <string name="label_sync_settings_wifi_title">"Sync only on Wi-Fi"</string>
-    <string name="label_sync_settings_contacts_title">"Link keys to contacts"</string>
-    <string name="label_sync_settings_contacts_summary_on">"Link keys to contacts based on names and email addresses. This happens completely offline on your device."</string>
-    <string name="label_sync_settings_contacts_summary_off">"New keys will not be linked to contacts"</string>
-    <!-- label shown in Android settings under the OpenKeychain account -->
-    <string name="keyserver_sync_settings_title">"Automatic key updates"</string>
 
     <string name="label_experimental_settings_desc_title">"Warning"</string>
     <string name="label_experimental_settings_desc_summary">"These features are not yet finished or results of user experience/security research. Thus, don't rely on their security and please don't report issues you encounter!"</string>

OpenKeychain/src/main/res/xml/account_desc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountPreferences="@xml/account_preferences"
-    android:accountType="@string/account_type"
-    android:icon="@mipmap/ic_launcher"
-    android:label="@string/app_name" />

OpenKeychain/src/main/res/xml/sync_adapter_contacts.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="com.android.contacts"
-    android:accountType="@string/account_type"
-    android:supportsUploading="false"
-    android:userVisible="true"
-    android:allowParallelSyncs="false"
-    android:isAlwaysSyncable="true" />

OpenKeychain/src/main/res/xml/sync_adapter_contacts_structure.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
-    <ContactsDataKind
-        android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
-        android:detailColumn="data1" />
-</ContactsSource>

OpenKeychain/src/main/res/xml/sync_preferences.xml

@@ -3,15 +3,14 @@
         android:key="syncKeyserver"
         android:defaultValue="true"
         android:persistent="true"
-        android:title="@string/label_sync_settings_keyserver_title"/>
+        android:title="@string/label_sync_settings_keyserver_title"
+        android:summaryOn="@string/label_sync_settings_keyserver_summary_on"
+        android:summaryOff="@string/label_sync_settings_keyserver_summary_off"
+        />
     <SwitchPreference
         android:key="enableWifiSyncOnly"
         android:defaultValue="true"
         android:persistent="true"
         android:dependency="syncKeyserver"
         android:title="@string/label_sync_settings_wifi_title"/>
-    <SwitchPreference
-        android:key="syncContacts"
-        android:persistent="false"
-        android:title="@string/label_sync_settings_contacts_title" />
 </PreferenceScreen>