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 @@
unbekannt
Kann nicht unterschreiben
Kein Unterschlüssel zum Verschlüsseln verfügbar!
- Erstelle OpenKeychain-Benutzerkonten nicht manuell.\nFür mehr Informationen sieh in die Hilfe.
+ Erstelle OpenKeychain-Benutzerkonten nicht manuell.\nFür mehr Informationen sieh in die Hilfe.
Schlüssel anzeigen (%s)
Nach unten wischen um von Schlüsselserver zu aktualisieren
Mindestens eine Datei zum Verschlüsseln auswählen!
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 @@
desconocido
no puede firmarse
¡No hay subclave de cifrado disponible!
- No crear Cuentas-OpenKeychain manualmente.\nPara más información, vea la Ayuda.
+ No crear Cuentas-OpenKeychain manualmente.\nPara más información, vea la Ayuda.
Mostrar clave (%s)
Gesto de barrido hacia abajo para actualizar desde el servidor de claves
¡Seleccione al menos un fichero a cifrar!
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 @@
ezezaguna
ezin da sinatu
Ez dago enkriptaketa azpigiltzarik eskuragarri!
- Ez sortu OpenKeychain-Kontuak eskuz.\n.Argibide gehiagorako, ikusi Laguntza.
+ Ez sortu OpenKeychain-Kontuak eskuz.\n.Argibide gehiagorako, ikusi Laguntza.
Erakutsi (%s) giltza
Irristatu behera giltza-zerbitzaritik eguneratzeko
Hautatu agiri bat gutxienez enkriptatzeko!
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 @@
inconnu
impossible de signer
Aucune sous-clef de chiffrement n\'est proposée !
- Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.
+ Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.
Montrer la clef (%s)
Glisser vers le bas pour mettre à jour à partir du serveur de clefs
Choisir au moins un fichier à chiffrer !
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
sconosciuto
non può firmare
Nessuna sottochiave di codifica disponibile!
- Non creare account OpenKeychain manualmente.\nPer ulteriori informazioni, vedere la Guida.
+ Non creare account OpenKeychain manualmente.\nPer ulteriori informazioni, vedere la Guida.
Mostra chiave (%s)
Seleziona almeno un file da codificare!
Chiave:
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 @@
不明
署名不可
暗号化の副鍵がありません!
- OpenKeychainのアカウントを手動では生成できません.
+ OpenKeychainのアカウントを手動では生成できません.
より詳細は、ヘルプを参照のこと。
鍵 (%s) を表示
下スワイプでキーサーバから更新します
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 @@
onbekend
kan niet ondertekenen
Geen codeer-subsleutel beschikbaar!
- Maak OpenKeychain-accounts niet handmatig aan.\nVoor meer informatie, zie Help.
+ Maak OpenKeychain-accounts niet handmatig aan.\nVoor meer informatie, zie Help.
Toon sleutel (%s)
Veeg naar beneden om van sleutelserver te updaten
Selecteer minstens een bestand om te versleutelen!
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 @@
непознат
не може да потпише
Поткључ за шифровање није доступан!
- Не прави налоге Отвореног кључарника ручно.\nПогледајте Помоћ за више информација.
+ Не прави налоге Отвореног кључарника ручно.\nПогледајте Помоћ за више информација.
Прикажи кључ (%s)
Превуците прстом доле да ажурирате са сервера кључева
Изаберите бар један фајл за шифровање!
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 @@
okänd
kan inte signera
Ingen krypteringsundernyckel tillgänglig!
- Skapa inte OpenKeychain-konton manuellt. \nFör mer information, se Hjälp.
+ Skapa inte OpenKeychain-konton manuellt. \nFör mer information, se Hjälp.
Visa nyckel (%s)
Dra nedåt för att uppdatera från nyckelserver
Välj åtminstone en fil att kryptera!
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 @@
bilinmeyen
imzalanamadı
Şifreleme için kullanılabilecek altanahtar mevcut değil!
- OpenKeychain-hesaplarını kendiniz oluşturmayın.\nDaha fazla bilgi için Yardım bölümüne bakın.
+ OpenKeychain-hesaplarını kendiniz oluşturmayın.\nDaha fazla bilgi için Yardım bölümüne bakın.
Anahtarı göster (%s)
Anahtar sunucudan güncelleme almak için parmağınızı aşağıya doğru kaydırın
Şifrelemek için en az bir dosya seçin!
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 @@
查看認證內容
未知
沒有可供加密的子金鑰!
- 請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。
+ 請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。
要發起金鑰交換,先在右邊選擇與會人數,然後點選〝開始交換〞。\n\n接下來會詢問你兩個問題,以確保會議成員與交換的指紋是正確的。
開始交換
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 @@
"unknown"
"cannot sign"
"No encryption subkey available!"
- "Do not create OpenKeychain-Accounts manually.\nFor more information, see Help."
"Show key (%s)"
"Swipe down to update from keyserver"
"Select at least one file to encrypt!"
@@ -1398,6 +1397,11 @@
"Start exchange"
]]>
+
+ "You can not create OpenKeychain accounts manually."
+ "Privacy"
+ "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."
+
Choose an unlock method
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 @@
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 @@
+
+
+
+
+
+
+
\ No newline at end of file