aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 11:30:16 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 11:30:16 +0200
commit5c747a747f20fbbfeb31b60ed4d45ea96fa04f41 (patch)
tree1cb0ad63bba61ac203b9552e3b8994657d58b2bc /OpenKeychain/src/main/res
parent346b5dbb2821254ffc7052871e5ded3207edc29f (diff)
downloadopen-keychain-5c747a747f20fbbfeb31b60ed4d45ea96fa04f41.tar.gz
open-keychain-5c747a747f20fbbfeb31b60ed4d45ea96fa04f41.tar.bz2
open-keychain-5c747a747f20fbbfeb31b60ed4d45ea96fa04f41.zip
Update from transifex
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-de/help_start.html24
-rw-r--r--OpenKeychain/src/main/res/raw-el/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-es/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-et/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-fa-rIR/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-fr/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-it-rIT/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-ja/help_changelog.html2
-rw-r--r--OpenKeychain/src/main/res/raw-ja/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-ko/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-nl-rNL/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-pl/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-ru/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-sl/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-tr/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-uk/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/raw-zh/help_start.html5
-rw-r--r--OpenKeychain/src/main/res/values-de/strings.xml10
-rw-r--r--OpenKeychain/src/main/res/values-es/strings.xml19
-rw-r--r--OpenKeychain/src/main/res/values-fr/strings.xml19
-rw-r--r--OpenKeychain/src/main/res/values-it-rIT/strings.xml19
-rw-r--r--OpenKeychain/src/main/res/values-ja/strings.xml21
-rw-r--r--OpenKeychain/src/main/res/values-pl/strings.xml1
-rw-r--r--OpenKeychain/src/main/res/values-ru/strings.xml1
-rw-r--r--OpenKeychain/src/main/res/values-sl/strings.xml19
-rw-r--r--OpenKeychain/src/main/res/values-uk/strings.xml1
27 files changed, 202 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
index 6c60c1778..6ded872ea 100644
--- a/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
+++ b/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html
new file mode 100644
index 000000000..2fb606f76
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-de/help_start.html
@@ -0,0 +1,24 @@
+<html>
+<head></head>
+<body>
+<h2>Los gehts</h2>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+
+<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
+<h2>Ich habe einen Fehler in OpenKeychain gefunden!</h2>
+<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+
+<h2>Unterstützen</h2>
+<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+
+<h2>Übersetzungen</h2>
+<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-el/help_start.html b/OpenKeychain/src/main/res/raw-el/help_start.html
index 6c60c1778..6ded872ea 100644
--- a/OpenKeychain/src/main/res/raw-el/help_start.html
+++ b/OpenKeychain/src/main/res/raw-el/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-es/help_start.html b/OpenKeychain/src/main/res/raw-es/help_start.html
index eeb6e1535..fa9b4dc3b 100644
--- a/OpenKeychain/src/main/res/raw-es/help_start.html
+++ b/OpenKeychain/src/main/res/raw-es/help_start.html
@@ -6,6 +6,11 @@
<p>Es recomendable que instales <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> para una mejor selección de archivos y <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> para escanear los códigos QR generados. Pulsando en los enlaces se abrirá Google Play o F-Droid.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>¡He encontrado un bug en OpenKeychain!</h2>
<p>Por favor, informa de errores usando el <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">seguimiento de incidencias de OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-et/help_start.html b/OpenKeychain/src/main/res/raw-et/help_start.html
index 6c60c1778..6ded872ea 100644
--- a/OpenKeychain/src/main/res/raw-et/help_start.html
+++ b/OpenKeychain/src/main/res/raw-et/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
index bf15b21f0..e8c04c7ae 100644
--- a/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_start.html b/OpenKeychain/src/main/res/raw-fr/help_start.html
index 5b8a062ba..ed957c21a 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_start.html
@@ -6,6 +6,11 @@
<p>Il vous est recommendé d'installer le <a href="market://details?id=org.openintents.filemanager">gestionnaire de fichiers OI</a> pour sa fonction améliorée de séléction des fichiers et le <a href="market://details?id=com.google.zxing.client.android">lecteur de codes à barres</a> pour balayer les codes QR générés. Cliquer sur les liens ouvrira Google Play Store ou F-Droid pour l'installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>J'ai trouvé un bogue dans OpenKeychain !</h2>
<p>Veuillez rapporter le bogue en utilisant le <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">gestionnaire de bogue d'OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-it-rIT/help_start.html b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
index de6418e5d..77866bc8c 100644
--- a/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
+++ b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html
@@ -6,6 +6,11 @@
<p>Si raccomanda di installare <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> per una migliore selezione dei file e <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> per scansionare i codici QR. I collegamenti verranno aperti in Google Play Store o F-Droid per l'installazione.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>Ho trovato un bug in OpenKeychain!</h2>
<p>Per favore riporta i bug usando il <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker di OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index c7f943602..db405d7a3 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -25,7 +25,7 @@
また、以下の人達(アルファベット順)の作ってくれたいくつもののさなパッチや相当数のパッチにも:
Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
<ul>
-<li>新しい統合キーリスト</li>
+<li>新しい統合鍵リスト</li>
<li>鍵指紋のカラー化</li>
<li>鍵サーバのポート設定のサポート</li>
<li>弱い鍵の生成が可能だったのを無効化</li>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html
index 13154ce47..502d4adb8 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_start.html
@@ -6,6 +6,11 @@
<p>ファイルの選択を拡張するには<a href="market://details?id=org.openintents.filemanager">OI File Manager</a>、<a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>を生成したQRコードのスキャンのため、それぞれのインストールを必要とします。 リンクをクリックして、Google Play Store上かF-Droidからインストールしてください。</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>OpenKeychainでバグを見付けた!</h2>
<p><a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychainのIssueトラッカー</a>を使ってバグレポートを送ってください。</p>
diff --git a/OpenKeychain/src/main/res/raw-ko/help_start.html b/OpenKeychain/src/main/res/raw-ko/help_start.html
index 6c60c1778..6ded872ea 100644
--- a/OpenKeychain/src/main/res/raw-ko/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ko/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
index 6c60c1778..6ded872ea 100644
--- a/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
+++ b/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_start.html b/OpenKeychain/src/main/res/raw-pl/help_start.html
index de157b232..ca10ec4b1 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_start.html
@@ -6,6 +6,11 @@
<p>Zalecana jest instalacja menadżera plików <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> w celu zapewnienia wygodniejszego wyboru plików oraz programu <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>, który jest w stanie skanować wygenerowane kody QR. Kliknięcie na powyższe linki przekieruje Cię do sklepu Google Play / F-Droid.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>Znalazłem błąd w OpenKeychain!</h2>
<p>Zgłoś błąd korzystając z <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">systemu śledzenia błędów OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html
index c0fa7383d..022b80afc 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.html
@@ -6,6 +6,11 @@
<p>Рекомендуется установить <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> для удобного выбора файлов и <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> для распознавания QR кодов. Перейдите по ссылкам на соответствующие страницы Google Play или F-Droid для дальнейшей установки.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>Я нашел ошибку в OpenKeychain!</h2>
<p>Пожалуйста, сообщайте о возникших проблемах и найденных ошибках в разделе <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Решение проблем OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_start.html b/OpenKeychain/src/main/res/raw-sl/help_start.html
index 7ca44ddb2..2b78e289a 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_start.html
@@ -6,6 +6,11 @@
<p>Priporočamo, da namestite aplikaciji <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> za boljše delo z datotekami in <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> za skeniranje kod QR. Klik na povezavi bo odprl trgovino Google Play Store ali F-Droid za namestitev.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>Našel sem 'hrošča' v aplikaciji OpenKeychain!</h2>
<p>Za poročanje o 'hroščih' uporabite <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">sledilnik težav za OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_start.html b/OpenKeychain/src/main/res/raw-tr/help_start.html
index 6c60c1778..6ded872ea 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>I found a bug in OpenKeychain!</h2>
<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_start.html b/OpenKeychain/src/main/res/raw-uk/help_start.html
index a3c112bd1..1a4a7fab0 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_start.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_start.html
@@ -6,6 +6,11 @@
<p>Рекомендуємо вам встановити <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> для поліпшеного виділення файлів та <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> для сканування згенерованих штрих-кодів. Натискання посилань відкриє Google Play або F-Droid для встановлення.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>Я знайшов помилку в OpenPGP Keychain!</h2>
<p>Будь ласка, повідомте про ваду за допомогою <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">відстежувача проблем OpenPGP Keychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
index 52a8b6f7c..7abb144a0 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.html
@@ -6,6 +6,11 @@
<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<h2>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:</p>
+<p><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations">Conversations</a>: Jabber/XMPP client</p>
+<p><img src="apps_k9">K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!</p>
+
<h2>我在OpenKeychain發現問題!</h2>
<p>請利用 <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain 項目回報系統</a>回報問題。</p>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index b33506438..04a35ab47 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -66,6 +66,7 @@
<string name="btn_encryption_advanced_settings_show">Erweiterte Einstellungen anzeigen</string>
<string name="btn_encryption_advanced_settings_hide">Erweiterte Einstellungen verbergen</string>
<string name="btn_share_encrypted_signed">Verschlüsselt/signierten Text teilen…</string>
+ <string name="btn_view_cert_key">Beglaubigungsschlüssel anzeigen</string>
<!--menu-->
<string name="menu_preferences">Einstellungen</string>
<string name="menu_help">Hilfe</string>
@@ -374,7 +375,6 @@
<string name="intent_send_encrypt">Mit OpenKeychain verschlüsseln</string>
<string name="intent_send_decrypt">Mit OpenKeychain entschlüsseln</string>
<!--Remote API-->
- <string name="api_no_apps">Keine registrierten Anwendungen vorhanden!\n\nAnwendungen können Zugriff auf OpenKeychain anfordern. Nachdem Zugriff erlaubt wurde, werden diese hier aufgelistet.</string>
<string name="api_settings_show_info">Erweiterte Informationen anzeigen</string>
<string name="api_settings_hide_info">Erweiterte Informationen ausblenden</string>
<string name="api_settings_show_advanced">Erweiterte Einstellungen anzeigen</string>
@@ -390,6 +390,7 @@
<string name="api_settings_package_signature">SHA-256 der Paketsignatur</string>
<string name="api_settings_accounts">Konten</string>
<string name="api_settings_accounts_empty">Keine Accounts mit dieser App verknüpft.</string>
+ <string name="api_create_account_text">Die Anwendung erfordert die Erstellung eines neuen Accounts. Bitte wähle einen existierenden Schlüssel oder erstelle einen neuen.\nAnwendungen sind auf die Nutzung der Schlüssel beschränkt, die du hier auswählst!</string>
<string name="api_register_text">Folgende Anwendung beantragt Zugriff auf OpenKeychains API.\nZugriff erlauben?\n\nVORSICHT: Sollten Sie nicht wissen, warum diese Anfrage erscheint, sollten Sie den Zugriff nicht erlauben! Sie können Zugriffe später über das Menü \'Registrierte Anwendungen\' widerrufen.</string>
<string name="api_register_allow">Zugriff erlauben</string>
<string name="api_register_disallow">Zugriff verbieten</string>
@@ -439,9 +440,9 @@
<string name="secret_key_no">nicht verfügbar</string>
<!--hints-->
<string name="encrypt_content_edit_text_hint">Hier den Text schreiben welche verschlüsselt und/oder signiert werden soll...</string>
- <string name="decrypt_content_edit_text_hint">Hier den verschlüsselten Text eingeben um ihn zu entschlüsseln und/oder zu überprüfen</string>
+ <string name="decrypt_content_edit_text_hint">Hier den verschlüsselten Text eingeben um ihn zu entschlüsseln und/oder zu verifzieren…</string>
<!--certs-->
- <string name="cert_default">Grundeinstellung</string>
+ <string name="cert_default">normal</string>
<string name="cert_none">kein</string>
<string name="cert_casual">einfach überprüft</string>
<string name="cert_positive">positiv</string>
@@ -458,11 +459,12 @@
<string name="empty_certs">Keine Beglaubigungen für diesen Schlüssel</string>
<string name="section_uids_to_certify">Zu beglaubigende Identitäten</string>
<string name="label_revocation">Widerrufsgrund</string>
- <string name="label_verify_status">Verificationsstatus</string>
+ <string name="label_verify_status">Verifikationsstatus</string>
<string name="label_cert_type">Typ</string>
<string name="error_key_not_found">Schlüssel nicht gefunden!</string>
<string name="error_key_processing">Fehler bei der Verarbeitung des Schlüssels!</string>
<string name="no_subkey">Unterschlüssel nicht verfügbar</string>
+ <string name="key_stripped">nicht verfügbar</string>
<string name="secret_cannot_multiple">Geheime Schlüssel können nur einzeln gelöscht werden!</string>
<string name="title_view_cert">Zertifikatdetails anzeigen</string>
<string name="unknown_algorithm">unbekannt</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 17ac6c788..18d59f411 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -15,6 +15,7 @@
<string name="title_set_passphrase">Establecer frase de contraseña</string>
<string name="title_share_with">Compartir con...</string>
<string name="title_share_fingerprint_with">Compartir huella de validación de clave con...</string>
+ <string name="title_share_key">Compartir clave con...</string>
<string name="title_share_file">Compartir fichero con...</string>
<string name="title_encrypt_to_file">Cifrar hacia archivo</string>
<string name="title_decrypt_to_file">Descifrar hacia archivo</string>
@@ -23,6 +24,7 @@
<string name="title_export_keys">Exportar claves</string>
<string name="title_key_not_found">Clave no encontrada</string>
<string name="title_send_key">Cargar al servidor de claves</string>
+ <string name="title_certify_key">Certificar identidades</string>
<string name="title_key_details">Detalles de la clave</string>
<string name="title_help">Ayuda</string>
<!--section-->
@@ -34,15 +36,20 @@
<string name="section_master_key">Clave maestra</string>
<string name="section_master_user_id">Identidad primaria</string>
<string name="section_actions">Acciones</string>
+ <string name="section_share_key">Clave completa</string>
<string name="section_certification_key">Tu clave usada para las certificaciones</string>
<string name="section_upload_key">Cargar clave</string>
<string name="section_key_server">Servidor de claves</string>
<string name="section_encrypt_and_or_sign">Cifrar y/o firmar</string>
<string name="section_decrypt_verify">Descifrar y verificar</string>
<string name="section_fingerprint">Huella de validación de clave</string>
+ <string name="section_key_to_certify">Clave a ser certificada</string>
<!--button-->
<string name="btn_certify">Certificar</string>
+ <string name="btn_decrypt_verify_file">Descifrar, verificar, y guardar fichero</string>
+ <string name="btn_decrypt_verify_message">Descifrar y verificar mensaje</string>
<string name="btn_decrypt_verify_clipboard">Desde el portapapeles</string>
+ <string name="btn_encrypt_file">Cifrar y guardar fichero</string>
<string name="btn_save">Guardar</string>
<string name="btn_do_not_save">Cancelar</string>
<string name="btn_delete">Eliminar</string>
@@ -58,6 +65,8 @@
<string name="btn_lookup_key">Buscar clave</string>
<string name="btn_encryption_advanced_settings_show">Mostrar ajustes avanzados</string>
<string name="btn_encryption_advanced_settings_hide">Ocultar ajustes avanzados</string>
+ <string name="btn_share_encrypted_signed">Compartir mensaje cifrado/firmado...</string>
+ <string name="btn_view_cert_key">Ver clave de verificación</string>
<!--menu-->
<string name="menu_preferences">Ajustes</string>
<string name="menu_help">Ayuda</string>
@@ -229,11 +238,13 @@
<item quantity="other">%d malas claves secretas ignoradas. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item>
</plurals>
<string name="key_send_success">Clave cargada al servidor satisfactoriamente</string>
+ <string name="key_certify_success">Identidades certificadas con éxito</string>
<string name="list_empty">¡Esta lista está vacía!</string>
<string name="nfc_successful">¡Clave enviada con éxito vía NFC Beam (haz NFC)!</string>
<string name="key_copied_to_clipboard">¡La clave ha sido copiada al portapapeles!</string>
<string name="fingerprint_copied_to_clipboard">¡La huella de validación de clave se ha copiado al portapapeles!</string>
<string name="key_has_already_been_certified">¡La clave ya ha sido certificada!</string>
+ <string name="select_key_to_certify">Por favor ¡seleccione una clave para ser usada en certificación!</string>
<string name="key_too_big_for_sharing">¡La clave es demasiado grande para ser compartida de esta forma!</string>
<!--errors
no punctuation, all lowercase,
@@ -366,7 +377,6 @@
<string name="intent_send_encrypt">Cifrar con OpenKeychain</string>
<string name="intent_send_decrypt">Descifrar con OpenKeychain</string>
<!--Remote API-->
- <string name="api_no_apps">¡No hay aplicaciones registradas!\n\nLas aplicaciones de terceros pueden pedir permiso de acceso a OpenKeychain. Después de obtener acceso, serán enumeradas aquí.</string>
<string name="api_settings_show_info">Mostrar información avanzada</string>
<string name="api_settings_hide_info">Ocultar información avanzada</string>
<string name="api_settings_show_advanced">Mostrar la configuración avanzada</string>
@@ -411,8 +421,12 @@
<string name="key_view_action_edit">Editar clave</string>
<string name="key_view_action_encrypt">Cifrar con esta clave</string>
<string name="key_view_action_certify">Certificar identidades</string>
+ <string name="key_view_action_share_with">Compartir con...</string>
+ <string name="key_view_action_share_nfc">Compartir sobre NFC juntando los dispositivos por el reverso</string>
<string name="key_view_tab_main">Información principal</string>
<string name="key_view_tab_share">Compartir</string>
+ <string name="key_view_tab_keys">Subclaves</string>
+ <string name="key_view_tab_certs">Certificados</string>
<!--Navigation Drawer-->
<string name="nav_keys">Claves</string>
<string name="nav_encrypt">Firmar y cifrar</string>
@@ -440,10 +454,12 @@
<string name="cert_verify_error">¡error!</string>
<string name="cert_verify_unavailable">clave no disponible</string>
<!--unsorted-->
+ <string name="section_certifier_id">Certificador</string>
<string name="section_cert">Detalles del certificado</string>
<string name="label_user_id">Identidad</string>
<string name="unknown_uid">&lt;desconocido&gt;</string>
<string name="empty_certs">No hay certificados para esta clave</string>
+ <string name="section_uids_to_certify">Identidades a certificar</string>
<string name="label_revocation">Razón de la revocación</string>
<string name="label_verify_status">Estado de la verificación</string>
<string name="label_cert_type">Tipo</string>
@@ -455,4 +471,5 @@
<string name="title_view_cert">Ver detalles del certificado</string>
<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>
</resources>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 78265110d..0c9b0cb8e 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -15,6 +15,7 @@
<string name="title_set_passphrase">Définir la phrase de passe</string>
<string name="title_share_with">Partager avec...</string>
<string name="title_share_fingerprint_with">Partager l\'empreinte avec...</string>
+ <string name="title_share_key">Partager la clef avec...</string>
<string name="title_share_file">Partager le fichier avec...</string>
<string name="title_encrypt_to_file">Chiffrer vers un fichier</string>
<string name="title_decrypt_to_file">Déchiffrer vers un fichier</string>
@@ -23,6 +24,7 @@
<string name="title_export_keys">Exporter les clefs</string>
<string name="title_key_not_found">Clef introuvable</string>
<string name="title_send_key">Téléverser vers le serveur de clefs</string>
+ <string name="title_certify_key">Certifier les identités</string>
<string name="title_key_details">Détails sur la clef</string>
<string name="title_help">Aide</string>
<!--section-->
@@ -34,15 +36,20 @@
<string name="section_master_key">Clef maîtresse</string>
<string name="section_master_user_id">Identité principale</string>
<string name="section_actions">Actions</string>
+ <string name="section_share_key">Clef entière</string>
<string name="section_certification_key">Votre clef utilisée pour la certification</string>
<string name="section_upload_key">Téléverser la clef</string>
<string name="section_key_server">Serveur de clefs</string>
<string name="section_encrypt_and_or_sign">Chiffrer et/ou signer</string>
<string name="section_decrypt_verify">Déchiffrer et vérifier</string>
<string name="section_fingerprint">Empreinte</string>
+ <string name="section_key_to_certify">Clef à certifier !</string>
<!--button-->
<string name="btn_certify">Certifier</string>
+ <string name="btn_decrypt_verify_file">Déchiffrer, vérifier et enregistrer le fichier</string>
+ <string name="btn_decrypt_verify_message">Déchiffrer et enregistrer le message</string>
<string name="btn_decrypt_verify_clipboard">À partir du presse-papiers</string>
+ <string name="btn_encrypt_file">Chiffrer et enregistrer le fichier</string>
<string name="btn_save">Enregistrer</string>
<string name="btn_do_not_save">Annuler</string>
<string name="btn_delete">Supprimer</string>
@@ -58,6 +65,8 @@
<string name="btn_lookup_key">Rechercher la clef</string>
<string name="btn_encryption_advanced_settings_show">Afficher les paramètres avancés</string>
<string name="btn_encryption_advanced_settings_hide">Masquer les paramètres avancés</string>
+ <string name="btn_share_encrypted_signed">Partager le message chiffré/signé...</string>
+ <string name="btn_view_cert_key">Voir la clef de certification</string>
<!--menu-->
<string name="menu_preferences">Paramètres</string>
<string name="menu_help">Aide</string>
@@ -229,11 +238,13 @@
<item quantity="other">%d mauvaises clefs ignorées. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
</plurals>
<string name="key_send_success">Clef téléversée vers le serveur avec succès</string>
+ <string name="key_certify_success">Identités certifiées avec succès</string>
<string name="list_empty">Cette liste est vide !</string>
<string name="nfc_successful">Clef envoyée par Beam NFC avec succès |</string>
<string name="key_copied_to_clipboard">La clef a été copié vers le presse-papiers !</string>
<string name="fingerprint_copied_to_clipboard">L\'empreinte a été copié vers le presse-papiers !</string>
<string name="key_has_already_been_certified">La clef a déjà été certifiée !</string>
+ <string name="select_key_to_certify">Veuillez choisir une clef à utiliser pour la certification !</string>
<string name="key_too_big_for_sharing">La clef est trop grosse pour être partagée ainsi !</string>
<!--errors
no punctuation, all lowercase,
@@ -366,7 +377,6 @@
<string name="intent_send_encrypt">Chiffrer avec OpenKeychain</string>
<string name="intent_send_decrypt">Déchiffrer avec OpenKeychain</string>
<!--Remote API-->
- <string name="api_no_apps">Aucune application enregistrée !\n\nLes applications tierces peuvent demander l\'accès à OpenKeychain. Après avoir autorisé l\'accès, elles seront listées ici.</string>
<string name="api_settings_show_info">Afficher les informations avancées</string>
<string name="api_settings_hide_info">Masquer les informations avancées</string>
<string name="api_settings_show_advanced">Afficher les paramètres avancés</string>
@@ -411,8 +421,12 @@
<string name="key_view_action_edit">Modifier la clef</string>
<string name="key_view_action_encrypt">Chiffrer avec cette clef</string>
<string name="key_view_action_certify">Certifier les identités</string>
+ <string name="key_view_action_share_with">Partager avec...</string>
+ <string name="key_view_action_share_nfc">Partager par NFC en tenant les appareils dos à dos</string>
<string name="key_view_tab_main">Infos principales</string>
<string name="key_view_tab_share">Partager</string>
+ <string name="key_view_tab_keys">Sous-clefs</string>
+ <string name="key_view_tab_certs">Certificats</string>
<!--Navigation Drawer-->
<string name="nav_keys">Clefs</string>
<string name="nav_encrypt">Signer et chiffrer</string>
@@ -440,10 +454,12 @@
<string name="cert_verify_error">erreur!</string>
<string name="cert_verify_unavailable">clef non disponible</string>
<!--unsorted-->
+ <string name="section_certifier_id">Certificateur</string>
<string name="section_cert">Détails du certificat</string>
<string name="label_user_id">identité</string>
<string name="unknown_uid">&lt;inconnu&gt;</string>
<string name="empty_certs">Aucun certificat pour cette clef</string>
+ <string name="section_uids_to_certify">Identités à certifier</string>
<string name="label_revocation">Raison de la révocation</string>
<string name="label_verify_status">État de vérification</string>
<string name="label_cert_type">Type</string>
@@ -455,4 +471,5 @@
<string name="title_view_cert">Voir les détails du certificat</string>
<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 disponible !</string>
</resources>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index ab159a923..b951bcf71 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -15,6 +15,7 @@
<string name="title_set_passphrase">Imposta Frase di Accesso</string>
<string name="title_share_with">Condividi con...</string>
<string name="title_share_fingerprint_with">Condivi impronta con...</string>
+ <string name="title_share_key">Condividi chiave con...</string>
<string name="title_share_file">Condividi file con...</string>
<string name="title_encrypt_to_file">Codifica File</string>
<string name="title_decrypt_to_file">Decodifica File</string>
@@ -23,6 +24,7 @@
<string name="title_export_keys">Esporta Chiavi</string>
<string name="title_key_not_found">Chiave Non Trovata</string>
<string name="title_send_key">Carica sul Server delle Chiavi</string>
+ <string name="title_certify_key">Certifica identità</string>
<string name="title_key_details">Dettagli Chiave</string>
<string name="title_help">Aiuto</string>
<!--section-->
@@ -34,15 +36,20 @@
<string name="section_master_key">Chiave Principale</string>
<string name="section_master_user_id">Identità Primaria</string>
<string name="section_actions">Azioni</string>
+ <string name="section_share_key">Intera chiave</string>
<string name="section_certification_key">La Tua Chiave usata per la certificazione</string>
<string name="section_upload_key">Carica Chiave</string>
<string name="section_key_server">Server delle Chiavi</string>
<string name="section_encrypt_and_or_sign">Codifica e/o Firma</string>
<string name="section_decrypt_verify">Decodifica e Verifica</string>
<string name="section_fingerprint">Impronta</string>
+ <string name="section_key_to_certify">Chiave da certificare</string>
<!--button-->
<string name="btn_certify">Certifica</string>
+ <string name="btn_decrypt_verify_file">Decodifica, verifica e salva su file</string>
+ <string name="btn_decrypt_verify_message">Decodifica e verifica messaggio</string>
<string name="btn_decrypt_verify_clipboard">Dagli Appunti</string>
+ <string name="btn_encrypt_file">Codifica e salva file</string>
<string name="btn_save">Salva</string>
<string name="btn_do_not_save">Annulla</string>
<string name="btn_delete">Elimina</string>
@@ -58,6 +65,8 @@
<string name="btn_lookup_key">Chiave di ricerca</string>
<string name="btn_encryption_advanced_settings_show">Mostra impostazioni avanzate</string>
<string name="btn_encryption_advanced_settings_hide">Nascondi impostazioni avanzate</string>
+ <string name="btn_share_encrypted_signed">Condividi messaggio codificato/firmato...</string>
+ <string name="btn_view_cert_key">Mostra chiave di certificazione</string>
<!--menu-->
<string name="menu_preferences">Impostazioni</string>
<string name="menu_help">Aiuto</string>
@@ -229,11 +238,13 @@
<item quantity="other">%d chiavi private non valide ignorate. Forse hai esportato con opzione\n--export-secret-subkeys\nAssicurati di esportare con\n--export-secret-keys\ninvece.</item>
</plurals>
<string name="key_send_success">Chiave caricata con successo sul server</string>
+ <string name="key_certify_success">Identità certificata correttamente</string>
<string name="list_empty">Lista vuota!</string>
<string name="nfc_successful">Chiave correttamente inviata tramite NFC Beam!</string>
<string name="key_copied_to_clipboard">Chiave copiata negli appunti!</string>
<string name="fingerprint_copied_to_clipboard">Impronta copiata negli appunti!</string>
<string name="key_has_already_been_certified">La chiave è già certificata!</string>
+ <string name="select_key_to_certify">Per favore seleziona una chiave per la certificazione!</string>
<string name="key_too_big_for_sharing">Chiave troppo grande per essere condivisa in questo modo!</string>
<!--errors
no punctuation, all lowercase,
@@ -366,7 +377,6 @@
<string name="intent_send_encrypt">Codifica con OpenKeychain</string>
<string name="intent_send_decrypt">Decodifica con OpenKeychain</string>
<!--Remote API-->
- <string name="api_no_apps">Nessuna app registrata!\n\nApp di terze parti possono richiedere l\'accesso a OpenKeychain. Dopo aver concesso l\'accesso, le app saranno elencate qui.</string>
<string name="api_settings_show_info">Mostra informazioni dettagliate</string>
<string name="api_settings_hide_info">Nascondi informazioni dettagliate</string>
<string name="api_settings_show_advanced">Mostra impostazioni avanzate</string>
@@ -411,8 +421,12 @@
<string name="key_view_action_edit">Modifica chiave</string>
<string name="key_view_action_encrypt">Codifica con questa chiave</string>
<string name="key_view_action_certify">Certifica identità</string>
+ <string name="key_view_action_share_with">Condividi con...</string>
+ <string name="key_view_action_share_nfc">Condividi con NFC tenendo i dispositivi a stretto contatto</string>
<string name="key_view_tab_main">Info Principale</string>
<string name="key_view_tab_share">Condividi</string>
+ <string name="key_view_tab_keys">Sottochiavi</string>
+ <string name="key_view_tab_certs">Certificati</string>
<!--Navigation Drawer-->
<string name="nav_keys">Chiavi</string>
<string name="nav_encrypt">Firma e Codifica</string>
@@ -440,10 +454,12 @@
<string name="cert_verify_error">errore!</string>
<string name="cert_verify_unavailable">chiave non disponibile</string>
<!--unsorted-->
+ <string name="section_certifier_id">Certificatore</string>
<string name="section_cert">Dettagli Certificato</string>
<string name="label_user_id">Identit</string>
<string name="unknown_uid">&lt;sconosciuto&gt;</string>
<string name="empty_certs">Nessun certificato per questa chiave</string>
+ <string name="section_uids_to_certify">Identità da certificare</string>
<string name="label_revocation">Ragione della Revoca</string>
<string name="label_verify_status">Stato Verifica</string>
<string name="label_cert_type">Tipo</string>
@@ -455,4 +471,5 @@
<string name="title_view_cert">Visualizza Dettagli Certificati</string>
<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>
</resources>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index f22c2da62..a04441cfa 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -15,6 +15,7 @@
<string name="title_set_passphrase">パスフレーズの設定</string>
<string name="title_share_with">...で共有</string>
<string name="title_share_fingerprint_with">...で指紋の共有</string>
+ <string name="title_share_key">...で鍵の共有</string>
<string name="title_share_file">...でファイルの共有</string>
<string name="title_encrypt_to_file">暗号化してファイルに</string>
<string name="title_decrypt_to_file">復号化してファイルに</string>
@@ -23,6 +24,7 @@
<string name="title_export_keys">複数鍵のエクスポート</string>
<string name="title_key_not_found">鍵が見当りません</string>
<string name="title_send_key">鍵サーバへアップロード</string>
+ <string name="title_certify_key">ユーザID検証</string>
<string name="title_key_details">鍵の概要</string>
<string name="title_help">ヘルプ</string>
<!--section-->
@@ -34,15 +36,20 @@
<string name="section_master_key">主鍵</string>
<string name="section_master_user_id">メインのユーザID</string>
<string name="section_actions">アクション</string>
+ <string name="section_share_key">すべての鍵</string>
<string name="section_certification_key">あなたの鍵を証明に利用します</string>
<string name="section_upload_key">鍵のアップロード</string>
<string name="section_key_server">鍵サーバ</string>
<string name="section_encrypt_and_or_sign">暗号化/署名</string>
<string name="section_decrypt_verify">復号化と検証</string>
<string name="section_fingerprint">指紋</string>
+ <string name="section_key_to_certify">鍵は検証されています。</string>
<!--button-->
<string name="btn_certify">証明</string>
+ <string name="btn_decrypt_verify_file">復号化と検証、そしてファイルの保存</string>
+ <string name="btn_decrypt_verify_message">メッセージの復号化と検証</string>
<string name="btn_decrypt_verify_clipboard">クリップボードから</string>
+ <string name="btn_encrypt_file">暗号化してファイルを保存</string>
<string name="btn_save">保存</string>
<string name="btn_do_not_save">キャンセル</string>
<string name="btn_delete">削除</string>
@@ -58,6 +65,8 @@
<string name="btn_lookup_key">鍵検出</string>
<string name="btn_encryption_advanced_settings_show">拡張設定を表示</string>
<string name="btn_encryption_advanced_settings_hide">拡張設定を隠す</string>
+ <string name="btn_share_encrypted_signed">暗号化/署名メッセージの共有...</string>
+ <string name="btn_view_cert_key">検証した鍵を見る</string>
<!--menu-->
<string name="menu_preferences">設定</string>
<string name="menu_help">ヘルプ</string>
@@ -191,7 +200,7 @@
<string name="key_deletion_confirmation_multi">選択したすべての公開鍵を削除して本当に良いのですか?\nこれは元に戻せません!</string>
<string name="secret_key_deletion_confirmation">秘密鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
<string name="ask_save_changed_key">あなたは鍵輪に変更を加えました、これを保存しますか?</string>
- <string name="ask_empty_id_ok">あなたは空のユーザーIDを追加しました、このまま続けますか?</string>
+ <string name="ask_empty_id_ok">あなたは空のユーザIDを追加しました、このまま続けますか?</string>
<string name="public_key_deletetion_confirmation">公開鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
<string name="also_export_secret_keys">秘密鍵もエクスポートしますか?</string>
<plurals name="keys_added_and_updated_1">
@@ -220,11 +229,13 @@
<item quantity="other">%d の問題ある鍵を無視しました。 おそらく次のオプションでエクスポートしています\n --export-secret-subkeys\n代りに次のオプションでエクスポートしてください。\n --export-secret-keys</item>
</plurals>
<string name="key_send_success">鍵を鍵サーバにアップロードしました</string>
+ <string name="key_certify_success">ユーザIDの検証に成功</string>
<string name="list_empty">このリストは空です!</string>
<string name="nfc_successful">NFCビームで鍵を送信しました!</string>
<string name="key_copied_to_clipboard">鍵はクリプボードにコピーされました!</string>
<string name="fingerprint_copied_to_clipboard">指紋はクリプボードにコピーされました!</string>
<string name="key_has_already_been_certified">鍵はすでに検証されています!</string>
+ <string name="select_key_to_certify">検証に使う鍵を選択して下さい!</string>
<string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string>
<!--errors
no punctuation, all lowercase,
@@ -353,7 +364,6 @@
<string name="intent_send_encrypt">OpenKeychainで暗号化</string>
<string name="intent_send_decrypt">OpenKeychainで復号化</string>
<!--Remote API-->
- <string name="api_no_apps">登録されていないアプリケーション!\n\nサードパーティアプリケーションはOpenKeychainにアクセスを要求できます。アクセスを与えた後、それらはここにリストされます。</string>
<string name="api_settings_show_info">詳細情報を表示</string>
<string name="api_settings_hide_info">詳細情報を非表示</string>
<string name="api_settings_show_advanced">拡張設定を表示</string>
@@ -397,8 +407,12 @@
<string name="key_view_action_edit">鍵の編集</string>
<string name="key_view_action_encrypt">この鍵で暗号化</string>
<string name="key_view_action_certify">ユーザID検証</string>
+ <string name="key_view_action_share_with">...で共有</string>
+ <string name="key_view_action_share_nfc">デバイスの後ろ同士を固定してNFC経由で共有</string>
<string name="key_view_tab_main">情報</string>
<string name="key_view_tab_share">共有</string>
+ <string name="key_view_tab_keys">副鍵</string>
+ <string name="key_view_tab_certs">証明</string>
<!--Navigation Drawer-->
<string name="nav_keys">鍵</string>
<string name="nav_encrypt">署名と暗号化</string>
@@ -426,10 +440,12 @@
<string name="cert_verify_error">エラー!</string>
<string name="cert_verify_unavailable">鍵がありません</string>
<!--unsorted-->
+ <string name="section_certifier_id">検証者</string>
<string name="section_cert">証明の詳細</string>
<string name="label_user_id">ユーザID</string>
<string name="unknown_uid">&lt;不明&gt;</string>
<string name="empty_certs">この鍵に証明がない</string>
+ <string name="section_uids_to_certify">ユーザIDを検証</string>
<string name="label_revocation">破棄の理由</string>
<string name="label_verify_status">検証ステータス</string>
<string name="label_cert_type">種別</string>
@@ -441,4 +457,5 @@
<string name="title_view_cert">証明の詳細を見る</string>
<string name="unknown_algorithm">不明</string>
<string name="can_sign_not">署名不可</string>
+ <string name="error_no_encrypt_subkey">暗号化の副鍵がありません!</string>
</resources>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 542998eca..2f327c9bd 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -365,7 +365,6 @@
<string name="intent_send_encrypt">Zaszyfruj korzystając z OpenKeychain</string>
<string name="intent_send_decrypt">Deszyfruj korzystając z OpenKeychain</string>
<!--Remote API-->
- <string name="api_no_apps">Brak zarejestrowanych aplikacji!\n\nZewnętrzne aplikacje mogą żądać dostępu do OpenKeychain. Po przyznaniu dostępu, będa wyświetlone tutaj.</string>
<string name="api_settings_show_info">Pokaż zaawansowane informacje</string>
<string name="api_settings_hide_info">Ukryj zaawansowane informacje</string>
<string name="api_settings_show_advanced">Pokaż zaawanowane ustawienia</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 326a6fe25..b51bcbde2 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -354,7 +354,6 @@
<string name="intent_send_encrypt">OpenKeychain: Зашифровать</string>
<string name="intent_send_decrypt">OpenKeychain: Расшифровать</string>
<!--Remote API-->
- <string name="api_no_apps">Нет связанных программ!\n\nСторонние программы могут запросить доступ к OpenKeychain, после чего они будут отражаться здесь.</string>
<string name="api_settings_show_info">Показать подробную информацию</string>
<string name="api_settings_hide_info">Скрыть подробную информацию</string>
<string name="api_settings_show_advanced">Показать расширенные настройки</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index bd370094d..f80db4b6c 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -15,6 +15,7 @@
<string name="title_set_passphrase">Določi geslo</string>
<string name="title_share_with">Deli z...</string>
<string name="title_share_fingerprint_with">Deli prstni odtis z...</string>
+ <string name="title_share_key">Deli ključ z...</string>
<string name="title_share_file">Deli datoteko z...</string>
<string name="title_encrypt_to_file">Šifriraj v datoteko</string>
<string name="title_decrypt_to_file">Dešifriraj v datoteko</string>
@@ -23,6 +24,7 @@
<string name="title_export_keys">Izvozi ključe</string>
<string name="title_key_not_found">Ključ ni bil najden</string>
<string name="title_send_key">Naloži na strežnik</string>
+ <string name="title_certify_key">Overi identiteto</string>
<string name="title_key_details">Podrobnosti o ključu</string>
<string name="title_help">Pomoč</string>
<!--section-->
@@ -34,15 +36,20 @@
<string name="section_master_key">Glavni ključ</string>
<string name="section_master_user_id">Glavna identiteta</string>
<string name="section_actions">Ravnanja</string>
+ <string name="section_share_key">Cel ključ</string>
<string name="section_certification_key">Vaš ključ, uporabljan za overitev</string>
<string name="section_upload_key">Naloži ključ</string>
<string name="section_key_server">Strežnik</string>
<string name="section_encrypt_and_or_sign">Šifriraj in/ali podpiši</string>
<string name="section_decrypt_verify">Dešifriraj in preveri</string>
<string name="section_fingerprint">Prstnim odtisom</string>
+ <string name="section_key_to_certify">Ključi za overjanje</string>
<!--button-->
<string name="btn_certify">Overi</string>
+ <string name="btn_decrypt_verify_file">Dešifriraj, preveri in shrani</string>
+ <string name="btn_decrypt_verify_message">Dešifriraj in preveri sporočilo</string>
<string name="btn_decrypt_verify_clipboard">Iz odložišča</string>
+ <string name="btn_encrypt_file">Šifriraj in shrani datoteko</string>
<string name="btn_save">Shrani</string>
<string name="btn_do_not_save">Prekliči</string>
<string name="btn_delete">Izbriši</string>
@@ -58,6 +65,8 @@
<string name="btn_lookup_key">Išči ključ</string>
<string name="btn_encryption_advanced_settings_show">Prikaži napredne nstavitve</string>
<string name="btn_encryption_advanced_settings_hide">Skrij napredne nastavitve</string>
+ <string name="btn_share_encrypted_signed">Deli šifrirano/podpisano sporočilo...</string>
+ <string name="btn_view_cert_key">Poglej ključ za overjanje</string>
<!--menu-->
<string name="menu_preferences">Nastavitve</string>
<string name="menu_help">Pomoč</string>
@@ -247,11 +256,13 @@
<item quantity="other">Neupoštevanih %d slabih zasebnih ključev. Morda so bili izvoženi na način\n --export-secret-subkeys\nPoskrbite, da bodo izvoženi z\n --export-secret-keys</item>
</plurals>
<string name="key_send_success">Ključ je bil uspešno naložen na strežnik.</string>
+ <string name="key_certify_success">Uspešno overjene identitete</string>
<string name="list_empty">Lista je prazna!</string>
<string name="nfc_successful">Ključ uspešno poslan preko NFC Beam!</string>
<string name="key_copied_to_clipboard">Ključ je bil prekopiran v odložišče!</string>
<string name="fingerprint_copied_to_clipboard">Prstni odtis je bil prekopiran v odložišče!</string>
<string name="key_has_already_been_certified">Ključ je že bil overjen!</string>
+ <string name="select_key_to_certify">Izberite ključ, ki ga boste uporabljali za overjanje!</string>
<string name="key_too_big_for_sharing">Ključ je prevelik za delitev na ta način!</string>
<!--errors
no punctuation, all lowercase,
@@ -392,7 +403,6 @@
<string name="intent_send_encrypt">Šifriraj z OpenKeychain</string>
<string name="intent_send_decrypt">Dešifriraj z OpenKeychain</string>
<!--Remote API-->
- <string name="api_no_apps">Ni nobene prijavljene aplikacije!\n\nDruge aplikacije lahko zahtevajo dostop do aplikacije OpenKeychain. Po potrditvi dostopa bodo navedene tukaj.</string>
<string name="api_settings_show_info">Pokaži dodatne informacije</string>
<string name="api_settings_hide_info">Skrij dodatne informacije</string>
<string name="api_settings_show_advanced">Pokaži napredne nastavitve</string>
@@ -439,8 +449,12 @@
<string name="key_view_action_edit">Uredi ključ</string>
<string name="key_view_action_encrypt">Šifriraj s tem ključem</string>
<string name="key_view_action_certify">Overi identitete</string>
+ <string name="key_view_action_share_with">Deli z...</string>
+ <string name="key_view_action_share_nfc">Deli preko NFC z držanjem hrbtov dveh telefonov skupaj</string>
<string name="key_view_tab_main">Glavne informacije</string>
<string name="key_view_tab_share">Deli</string>
+ <string name="key_view_tab_keys">Podključi</string>
+ <string name="key_view_tab_certs">Certifikati</string>
<!--Navigation Drawer-->
<string name="nav_keys">Ključi</string>
<string name="nav_encrypt">Podpiši in šifriraj</string>
@@ -468,10 +482,12 @@
<string name="cert_verify_error">napaka!</string>
<string name="cert_verify_unavailable">ključ ni na voljo</string>
<!--unsorted-->
+ <string name="section_certifier_id">Overovitelj</string>
<string name="section_cert">Podrobnosti potrdil</string>
<string name="label_user_id">Identiteta</string>
<string name="unknown_uid">&lt;neznan&gt;</string>
<string name="empty_certs">Ni potrdil za ta ključ</string>
+ <string name="section_uids_to_certify">Identitete za overitev</string>
<string name="label_revocation">Razlog za preklic</string>
<string name="label_verify_status">Status preverjanja</string>
<string name="label_cert_type">Vrsta</string>
@@ -483,4 +499,5 @@
<string name="title_view_cert">Preglej podrobosti certifikata</string>
<string name="unknown_algorithm">neznan</string>
<string name="can_sign_not">ne more podpisati</string>
+ <string name="error_no_encrypt_subkey">Ni nobenega podključa za šifriranje!</string>
</resources>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 508737e00..54204a044 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -348,7 +348,6 @@
<string name="intent_send_encrypt">Зашифрувати з OpenKeychain</string>
<string name="intent_send_decrypt">Розшифрувати з OpenKeychain</string>
<!--Remote API-->
- <string name="api_no_apps">Нема зареєстрованих програм!\n\nСтороні програми можуть вимагати доступ до OpenPGP Keychain. Після надання доступу вони будуть наведені тут.</string>
<string name="api_settings_show_info">Показати додаткову інформацію</string>
<string name="api_settings_hide_info">Приховати додаткову інформацію</string>
<string name="api_settings_show_advanced">Показати додаткові налаштування</string>