diff options
15 files changed, 28 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java index 41ff6d02b..18bc3cc9d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java @@ -83,7 +83,7 @@ public class DummyAccountService extends Service { public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) throws NetworkErrorException { response.onResult(new Bundle()); - toaster.toast(R.string.info_no_manual_account_creation); + toaster.toast(R.string.account_no_manual_account_creation); Log.d(Constants.TAG, "DummyAccountService.addAccount"); return null; } diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 8e14f9135..fe9963a91 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -1161,7 +1161,7 @@ <string name="unknown_algorithm">unbekannt</string> <string name="can_sign_not">Kann nicht unterschreiben</string> <string name="error_no_encrypt_subkey">Kein Unterschlüssel zum Verschlüsseln verfügbar!</string> - <string name="info_no_manual_account_creation">Erstelle OpenKeychain-Benutzerkonten nicht manuell.\nFür mehr Informationen sieh in die Hilfe.</string> + <string name="account_no_manual_account_creation">Erstelle OpenKeychain-Benutzerkonten nicht manuell.\nFür mehr Informationen sieh in die Hilfe.</string> <string name="contact_show_key">Schlüssel anzeigen (%s)</string> <string name="swipe_to_update">Nach unten wischen um von Schlüsselserver zu aktualisieren</string> <string name="error_no_file_selected">Mindestens eine Datei zum Verschlüsseln auswählen!</string> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 0668136cc..2287ac121 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -1233,7 +1233,7 @@ <string name="unknown_algorithm">desconocido</string> <string name="can_sign_not">no puede firmarse</string> <string name="error_no_encrypt_subkey">¡No hay subclave de cifrado disponible!</string> - <string name="info_no_manual_account_creation">No crear Cuentas-OpenKeychain manualmente.\nPara más información, vea la Ayuda.</string> + <string name="account_no_manual_account_creation">No crear Cuentas-OpenKeychain manualmente.\nPara más información, vea la Ayuda.</string> <string name="contact_show_key">Mostrar clave (%s)</string> <string name="swipe_to_update">Gesto de barrido hacia abajo para actualizar desde el servidor de claves</string> <string name="error_no_file_selected">¡Seleccione al menos un fichero a cifrar!</string> diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index 94400140b..ca17e0d61 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -1032,7 +1032,7 @@ <string name="unknown_algorithm">ezezaguna</string> <string name="can_sign_not">ezin da sinatu</string> <string name="error_no_encrypt_subkey">Ez dago enkriptaketa azpigiltzarik eskuragarri!</string> - <string name="info_no_manual_account_creation">Ez sortu OpenKeychain-Kontuak eskuz.\n.Argibide gehiagorako, ikusi Laguntza.</string> + <string name="account_no_manual_account_creation">Ez sortu OpenKeychain-Kontuak eskuz.\n.Argibide gehiagorako, ikusi Laguntza.</string> <string name="contact_show_key">Erakutsi (%s) giltza</string> <string name="swipe_to_update">Irristatu behera giltza-zerbitzaritik eguneratzeko</string> <string name="error_no_file_selected">Hautatu agiri bat gutxienez enkriptatzeko!</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index 7b3ad3fb7..96e7b9aba 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -1201,7 +1201,7 @@ <string name="unknown_algorithm">inconnu</string> <string name="can_sign_not">impossible de signer</string> <string name="error_no_encrypt_subkey">Aucune sous-clef de chiffrement n\'est proposée !</string> - <string name="info_no_manual_account_creation">Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.</string> + <string name="account_no_manual_account_creation">Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.</string> <string name="contact_show_key">Montrer la clef (%s)</string> <string name="swipe_to_update">Glisser vers le bas pour mettre à jour à partir du serveur de clefs</string> <string name="error_no_file_selected">Choisir au moins un fichier à chiffrer !</string> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 604f72f13..9a479c947 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -743,7 +743,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars <string name="unknown_algorithm">sconosciuto</string> <string name="can_sign_not">non può firmare</string> <string name="error_no_encrypt_subkey">Nessuna sottochiave di codifica disponibile!</string> - <string name="info_no_manual_account_creation">Non creare account OpenKeychain manualmente.\nPer ulteriori informazioni, vedere la Guida.</string> + <string name="account_no_manual_account_creation">Non creare account OpenKeychain manualmente.\nPer ulteriori informazioni, vedere la Guida.</string> <string name="contact_show_key">Mostra chiave (%s)</string> <string name="error_no_file_selected">Seleziona almeno un file da codificare!</string> <string name="key_colon">Chiave:</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index a50d0f941..690fa0134 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -1097,7 +1097,7 @@ <string name="unknown_algorithm">不明</string> <string name="can_sign_not">署名不可</string> <string name="error_no_encrypt_subkey">暗号化の副鍵がありません!</string> - <string name="info_no_manual_account_creation">OpenKeychainのアカウントを手動では生成できません. + <string name="account_no_manual_account_creation">OpenKeychainのアカウントを手動では生成できません. より詳細は、ヘルプを参照のこと。</string> <string name="contact_show_key">鍵 (%s) を表示</string> <string name="swipe_to_update">下スワイプでキーサーバから更新します</string> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index b35ed585e..cc00ebd63 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -1231,7 +1231,7 @@ <string name="unknown_algorithm">onbekend</string> <string name="can_sign_not">kan niet ondertekenen</string> <string name="error_no_encrypt_subkey">Geen codeer-subsleutel beschikbaar!</string> - <string name="info_no_manual_account_creation">Maak OpenKeychain-accounts niet handmatig aan.\nVoor meer informatie, zie Help.</string> + <string name="account_no_manual_account_creation">Maak OpenKeychain-accounts niet handmatig aan.\nVoor meer informatie, zie Help.</string> <string name="contact_show_key">Toon sleutel (%s)</string> <string name="swipe_to_update">Veeg naar beneden om van sleutelserver te updaten</string> <string name="error_no_file_selected">Selecteer minstens een bestand om te versleutelen!</string> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index b3ad055ec..ed385c9c2 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -1108,7 +1108,7 @@ <string name="unknown_algorithm">непознат</string> <string name="can_sign_not">не може да потпише</string> <string name="error_no_encrypt_subkey">Поткључ за шифровање није доступан!</string> - <string name="info_no_manual_account_creation">Не прави налоге Отвореног кључарника ручно.\nПогледајте Помоћ за више информација.</string> + <string name="account_no_manual_account_creation">Не прави налоге Отвореног кључарника ручно.\nПогледајте Помоћ за више информација.</string> <string name="contact_show_key">Прикажи кључ (%s)</string> <string name="swipe_to_update">Превуците прстом доле да ажурирате са сервера кључева</string> <string name="error_no_file_selected">Изаберите бар један фајл за шифровање!</string> diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index 402e60645..0d9d4e205 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -907,7 +907,7 @@ <string name="unknown_algorithm">okänd</string> <string name="can_sign_not">kan inte signera</string> <string name="error_no_encrypt_subkey">Ingen krypteringsundernyckel tillgänglig!</string> - <string name="info_no_manual_account_creation">Skapa inte OpenKeychain-konton manuellt. \nFör mer information, se Hjälp.</string> + <string name="account_no_manual_account_creation">Skapa inte OpenKeychain-konton manuellt. \nFör mer information, se Hjälp.</string> <string name="contact_show_key">Visa nyckel (%s)</string> <string name="swipe_to_update">Dra nedåt för att uppdatera från nyckelserver</string> <string name="error_no_file_selected">Välj åtminstone en fil att kryptera!</string> diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml index 8bef371da..529e80aa7 100644 --- a/OpenKeychain/src/main/res/values-tr/strings.xml +++ b/OpenKeychain/src/main/res/values-tr/strings.xml @@ -439,7 +439,7 @@ <string name="unknown_algorithm">bilinmeyen</string> <string name="can_sign_not">imzalanamadı</string> <string name="error_no_encrypt_subkey">Şifreleme için kullanılabilecek altanahtar mevcut değil!</string> - <string name="info_no_manual_account_creation">OpenKeychain-hesaplarını kendiniz oluşturmayın.\nDaha fazla bilgi için Yardım bölümüne bakın.</string> + <string name="account_no_manual_account_creation">OpenKeychain-hesaplarını kendiniz oluşturmayın.\nDaha fazla bilgi için Yardım bölümüne bakın.</string> <string name="contact_show_key">Anahtarı göster (%s)</string> <string name="swipe_to_update">Anahtar sunucudan güncelleme almak için parmağınızı aşağıya doğru kaydırın</string> <string name="error_no_file_selected">Şifrelemek için en az bir dosya seçin!</string> diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index 21bb339e7..7005543bc 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -630,7 +630,7 @@ <string name="title_view_cert">查看認證內容</string> <string name="unknown_algorithm">未知</string> <string name="error_no_encrypt_subkey">沒有可供加密的子金鑰!</string> - <string name="info_no_manual_account_creation">請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。</string> + <string name="account_no_manual_account_creation">請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。</string> <string name="exchange_description">要發起金鑰交換,先在右邊選擇與會人數,然後點選〝開始交換〞。\n\n接下來會詢問你兩個問題,以確保會議成員與交換的指紋是正確的。</string> <string name="btn_start_exchange">開始交換</string> <!--Passphrase wizard--> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index faa9aa39c..6572c39e8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1385,7 +1385,6 @@ <string name="unknown_algorithm">"unknown"</string> <string name="can_sign_not">"cannot sign"</string> <string name="error_no_encrypt_subkey">"No encryption subkey available!"</string> - <string name="info_no_manual_account_creation">"Do not create OpenKeychain-Accounts manually.\nFor more information, see Help."</string> <string name="contact_show_key">"Show key (%s)"</string> <string name="swipe_to_update">"Swipe down to update from keyserver"</string> <string name="error_no_file_selected">"Select at least one file to encrypt!"</string> @@ -1398,6 +1397,11 @@ <string name="btn_start_exchange">"Start exchange"</string> <string name="user_id_none"><![CDATA[<none>]]></string> + <!-- Android Account --> + <string name="account_no_manual_account_creation">"You can not create OpenKeychain accounts manually."</string> + <string name="account_privacy_title">"Privacy"</string> + <string name="account_privacy_text">"OpenKeychain does not synchronizes your contacts with the Internet. It only links contacts to keys based on names and email addresses. It does this offline on your device."</string> + <!-- Passphrase wizard --> <!-- TODO: rename all the things! --> <string name="title_unlock_method">Choose an unlock method</string> diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml index 6d8d76b02..e04160c5c 100644 --- a/OpenKeychain/src/main/res/xml/account_desc.xml +++ b/OpenKeychain/src/main/res/xml/account_desc.xml @@ -1,5 +1,6 @@ <?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="@drawable/ic_launcher" android:label="@string/app_name" /> diff --git a/OpenKeychain/src/main/res/xml/account_preferences.xml b/OpenKeychain/src/main/res/xml/account_preferences.xml new file mode 100644 index 000000000..3fdb54f1e --- /dev/null +++ b/OpenKeychain/src/main/res/xml/account_preferences.xml @@ -0,0 +1,10 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + + <PreferenceCategory android:title="@string/account_privacy_title" /> + + <Preference + android:persistent="false" + android:selectable="false" + android:summary="@string/account_privacy_text" /> + +</PreferenceScreen>
\ No newline at end of file |