aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-13 23:37:48 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-13 23:37:48 +0100
commit7b819e65de71a17827a3264a1a8663ca0d30b48c (patch)
tree25c03f37582402195c43fae01953058e62fa899e /OpenPGP-Keychain
parent519209da6386f66df628dc426e260a5392209337 (diff)
downloadopen-keychain-7b819e65de71a17827a3264a1a8663ca0d30b48c.tar.gz
open-keychain-7b819e65de71a17827a3264a1a8663ca0d30b48c.tar.bz2
open-keychain-7b819e65de71a17827a3264a1a8663ca0d30b48c.zip
Transifex update
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html2
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-ja/help_about.html43
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html108
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html12
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-ja/help_start.html19
-rw-r--r--OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html11
-rw-r--r--OpenPGP-Keychain/src/main/res/values-es/strings.xml4
-rw-r--r--OpenPGP-Keychain/src/main/res/values-fr/strings.xml2
-rw-r--r--OpenPGP-Keychain/src/main/res/values-ja/strings.xml149
-rw-r--r--OpenPGP-Keychain/src/main/res/values-ru/strings.xml9
-rw-r--r--OpenPGP-Keychain/src/main/res/values-uk/strings.xml2
-rw-r--r--OpenPGP-Keychain/src/main/res/values/strings.xml4
12 files changed, 360 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
index 18b42a296..dfb51dc81 100644
--- a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html
@@ -62,7 +62,7 @@
<ul>
<li>corregido el problema al añadir cuentas en Froyo</li>
<li>borrado seguro de archivo</li>
-<li>opción para borrar el archivo de la clave después de importarlo</li>
+<li>opción para borrar el archivo de clave después de importarlo</li>
<li>flujo de cifrado/descifrado (galería, etc.)</li>
<li>nuevas opciones (idioma, forzar firmas v3)</li>
<li>cambios en la interfaz</li>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
new file mode 100644
index 000000000..773d11fa7
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html
@@ -0,0 +1,43 @@
+<html>
+<head></head>
+<body>
+<p><a href="http://sufficientlysecure.org/keychain">http://sufficientlysecure.org/keychain</a></p>
+<p><a href="http://sufficientlysecure.org/keychain">OpenPGP Keychain</a> is an OpenPGP implementation for Android. The development began as a fork of Android Privacy Guard (APG).</p>
+<p>License: GPLv3+</p>
+
+<h2>Developers OpenPGP Keychain</h2>
+<ul>
+<li>Dominik Schürmann (Lead developer)</li>
+<li>Ash Hughes (crypto patches)</li>
+<li>Brian C. Barnes</li>
+<li>Bahtiar 'kalkin' Gadimov (UI)</li>
+
+</ul>
+<h2>Developers APG 1.x</h2>
+<ul>
+<li>'Thialfihar' (Lead developer)</li>
+<li>'Senecaso' (QRCode, sign key, upload key)</li>
+<li>Oliver Runge</li>
+<li>Markus Doits</li>
+</ul>
+<h2>Libraries</h2>
+<ul>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li>
+<li>
+<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
+<li>
+<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<li>
+<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<li>Icons from <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li>
+<li>Icons from <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Public Domain)</li>
+</ul>
+</body>
+</html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html
new file mode 100644
index 000000000..abf660ba8
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html
@@ -0,0 +1,108 @@
+<html>
+<head></head>
+<body>
+<h2>2.3</h2>
+<ul>
+<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
+<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li>
+<li>more internal fixes when editing keys (thanks to Ash Hughes)</li>
+<li>querying keyservers directly from the import screen</li>
+<li>fix layout and dialog style on Android 2.2-3.0</li>
+<li>fix crash on keys with empty user ids</li>
+<li>fix crash and empty lists when coming back from signing screen</li>
+<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
+<li>fix upload of key from signing screen</li>
+</ul>
+<h2>2.2</h2>
+<ul>
+<li>new design with navigation drawer</li>
+<li>new public key list design</li>
+<li>new public key view</li>
+<li>bug fixes for importing of keys</li>
+<li>key cross-certification (thanks to Ash Hughes)</li>
+<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
+<li>first version with new languages (thanks to the contributors on Transifex)</li>
+<li>sharing of keys via QR Codes fixed and improved</li>
+<li>package signature verification for API</li>
+</ul>
+<h2>2.1.1</h2>
+<ul>
+<li>API Updates, preparation for K-9 Mail integration</li>
+</ul>
+<h2>2.1</h2>
+<ul>
+<li>lots of bug fixes</li>
+<li>new API for developers</li>
+<li>PRNG bug fix by Google</li>
+</ul>
+<h2>2.0</h2>
+<ul>
+<li>complete redesign</li>
+<li>share public keys via qr codes, nfc beam</li>
+<li>sign keys</li>
+<li>upload keys to server</li>
+<li>fixes import issues</li>
+<li>new AIDL API</li>
+</ul>
+<h2>1.0.8</h2>
+<ul>
+<li>basic keyserver support</li>
+<li>app2sd</li>
+<li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
+<li>bugfixes</li>
+<li>optimizations</li>
+</ul>
+<h2>1.0.7</h2>
+<ul>
+<li>fixed problem with signature verification of texts with trailing newline</li>
+<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li>
+</ul>
+<h2>1.0.6</h2>
+<ul>
+<li>account adding crash on Froyo fixed</li>
+<li>secure file deletion</li>
+<li>option to delete key file after import</li>
+<li>stream encryption/decryption (gallery, etc.)</li>
+<li>new options (language, force v3 signatures)</li>
+<li>interface changes</li>
+<li>bugfixes</li>
+</ul>
+<h2>1.0.5</h2>
+<ul>
+<li>German and Italian translation</li>
+<li>much smaller package, due to reduced BC sources</li>
+<li>new preferences GUI</li>
+<li>layout adjustment for localization</li>
+<li>signature bugfix</li>
+</ul>
+<h2>1.0.4</h2>
+<ul>
+<li>fixed another crash caused by some SDK bug with query builder</li>
+</ul>
+<h2>1.0.3</h2>
+<ul>
+<li>fixed crashes during encryption/signing and possibly key export</li>
+</ul>
+<h2>1.0.2</h2>
+<ul>
+<li>filterable key lists</li>
+<li>smarter pre-selection of encryption keys</li>
+<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
+<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+</ul>
+<h2>1.0.1</h2>
+<ul>
+<li>GMail account listing was broken in 1.0.0, fixed again</li>
+</ul>
+<h2>1.0.0</h2>
+<ul>
+<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
+<li>support of more file managers (including ASTRO)</li>
+<li>Slovenian translation</li>
+<li>new database, much faster, less memory usage</li>
+<li>defined Intents and content provider for other apps</li>
+<li>bugfixes</li>
+</ul>
+</body>
+</html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html
new file mode 100644
index 000000000..88492731c
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html
@@ -0,0 +1,12 @@
+<html>
+<head></head>
+<body>
+<h2>How to receive keys</h2>
+<ol>
+<li>Go to your partners contacts and open the contact you want to share.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the your device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html
new file mode 100644
index 000000000..198dfe64f
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html
@@ -0,0 +1,19 @@
+<html>
+<head></head>
+<body>
+<h2>Getting started</h2>
+<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import 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>I found a bug in OpenPGP Keychain!</h2>
+<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p>
+
+<h2>Contribute</h2>
+<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+
+<h2>Translations</h2>
+<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p>
+
+</body>
+</html>
diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html
new file mode 100644
index 000000000..083e055c7
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<ol>
+<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
+<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the other person’s device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
index fe72d6106..0e22d4c4d 100644
--- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
@@ -303,7 +303,7 @@
<string name="progress_querying">consultando...</string>
<!--action strings-->
<string name="hint_public_keys">Buscar claves públicas</string>
- <string name="hint_secret_keys">Buscar las claves secretas</string>
+ <string name="hint_secret_keys">Buscar claves secretas</string>
<string name="action_share_key_with">Compartir la clave con...</string>
<!--key bit length selections-->
<string name="key_size_512">512</string>
@@ -378,6 +378,8 @@
<!--Key view-->
<string name="key_view_action_encrypt">Cifrar hacia este contacto</string>
<string name="key_view_action_certify">Certificar la clave de este contacto</string>
+ <string name="key_view_tab_main">Información</string>
+ <string name="key_view_tab_certs">Certificaciones</string>
<!--Navigation Drawer-->
<string name="nav_contacts">Contactos</string>
<string name="nav_encrypt">Cifrar</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
index cc0f17709..51ca32637 100644
--- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
@@ -378,6 +378,8 @@
<!--Key view-->
<string name="key_view_action_encrypt">Chiffrer vers ce contact</string>
<string name="key_view_action_certify">Certifier la clef de ce contact</string>
+ <string name="key_view_tab_main">Infos</string>
+ <string name="key_view_tab_certs">Certifications</string>
<!--Navigation Drawer-->
<string name="nav_contacts">Contacts</string>
<string name="nav_encrypt">Chiffrer</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
new file mode 100644
index 000000000..74af5c14b
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
@@ -0,0 +1,149 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--title-->
+ <string name="title_select_recipients">公開鍵の選択</string>
+ <string name="title_select_secret_key">秘密鍵の選択</string>
+ <string name="title_encrypt">暗号化</string>
+ <string name="title_decrypt">復号化</string>
+ <string name="title_authentication">パスフレーズ</string>
+ <string name="title_create_key">鍵の生成</string>
+ <string name="title_edit_key">鍵の編集</string>
+ <string name="title_preferences">設定</string>
+ <string name="title_api_registered_apps">登録済みのアプリケーション</string>
+ <string name="title_change_pass_phrase">パスフレーズの変更</string>
+ <string name="title_set_passphrase">パスフレーズの設定</string>
+ <string name="title_send_email">メールの送信...</string>
+ <string name="title_encrypt_to_file">暗号化してファイルに</string>
+ <string name="title_decrypt_to_file">復号化してファイルに</string>
+ <string name="title_import_keys">鍵のインポート</string>
+ <string name="title_export_key">鍵のエクスポート</string>
+ <string name="title_export_keys">複数鍵のエクスポート</string>
+ <string name="title_key_not_found">鍵が見当りません</string>
+ <string name="title_unknown_signature_key">不明な署名の鍵です</string>
+ <string name="title_help">ヘルプ</string>
+ <!--section-->
+ <string name="section_user_ids">ユーザーID</string>
+ <string name="section_keys">鍵</string>
+ <string name="section_general">一般</string>
+ <string name="section_defaults">デフォルト</string>
+ <string name="section_advanced">拡張</string>
+ <!--button-->
+ <string name="btn_sign">署名</string>
+ <string name="btn_decrypt">復号化</string>
+ <string name="btn_select_encrypt_keys">受信者の選択</string>
+ <string name="btn_encrypt_file">ファイル暗号化</string>
+ <string name="btn_save">保存</string>
+ <string name="btn_do_not_save">キャンセル</string>
+ <string name="btn_delete">削除</string>
+ <string name="btn_no_date">無し</string>
+ <string name="btn_okay">OK</string>
+ <string name="btn_change_passphrase">パスフレーズの変更</string>
+ <string name="btn_set_passphrase">パスフレーズの設定</string>
+ <string name="btn_search">検索</string>
+ <string name="btn_next">次</string>
+ <string name="btn_back">戻る</string>
+ <!--menu-->
+ <string name="menu_preferences">設定</string>
+ <string name="menu_import_from_file">ファイルからインポート</string>
+ <string name="menu_import_from_qr_code">QRコードからインポート</string>
+ <string name="menu_import_from_nfc">NFCからインポート</string>
+ <string name="menu_export_keys">すべての鍵のエクスポート</string>
+ <string name="menu_export_key">ファイルへのエクスポート</string>
+ <string name="menu_delete_key">鍵の削除</string>
+ <string name="menu_create_key">鍵の生成</string>
+ <string name="menu_create_key_expert">鍵の生成(上級)</string>
+ <string name="menu_search">検索</string>
+ <string name="menu_sign_key">鍵を署名</string>
+ <string name="menu_beam_preferences">Beamの設定</string>
+ <!--label-->
+ <string name="label_sign">署名</string>
+ <string name="label_message">メッセージ</string>
+ <string name="label_file">ファイル</string>
+ <string name="label_no_passphrase">パスフレーズなし</string>
+ <string name="label_passphrase">パスフレーズ</string>
+ <string name="label_passphrase_again">もう一度</string>
+ <string name="label_algorithm">アルゴリズム</string>
+ <string name="label_ascii_armor">アスキー形式</string>
+ <string name="label_delete_after_encryption">暗号化後に削除</string>
+ <string name="label_delete_after_decryption">復号化後に削除</string>
+ <string name="label_encryption_algorithm">暗号化アルゴリズム</string>
+ <string name="label_hash_algorithm">ハッシュアルゴリズム</string>
+ <string name="label_asymmetric">公開鍵</string>
+ <string name="label_symmetric">パスフレーズ</string>
+ <string name="label_passphrase_cache_ttl">パスフレーズキャッシュ</string>
+ <string name="label_message_compression">メッセージの圧縮</string>
+ <string name="label_file_compression">ファイルの圧縮</string>
+ <string name="label_force_v3_signature">強制的にV3形式の署名にする</string>
+ <string name="label_key_id">鍵ID</string>
+ <string name="label_creation">生成</string>
+ <string name="label_expiry">満了</string>
+ <string name="label_usage">使い方</string>
+ <string name="label_key_size">鍵サイズ</string>
+ <string name="label_main_user_id">主ユーザーID</string>
+ <string name="label_name">名前</string>
+ <string name="label_comment">コメント</string>
+ <string name="label_email">Eメール</string>
+ <string name="none">&lt;無し&gt;</string>
+ <string name="no_key">&lt;鍵無し&gt;</string>
+ <string name="unknown_status"></string>
+ <string name="can_encrypt">暗号化可能</string>
+ <string name="can_sign">署名可能</string>
+ <string name="expired">期限切れ</string>
+ <string name="fingerprint">指紋</string>
+ <string name="secret_key">秘密鍵:</string>
+ <!--choice-->
+ <string name="choice_none">無し</string>
+ <string name="choice_sign_only">署名のみ</string>
+ <string name="choice_encrypt_only">暗号化のみ</string>
+ <string name="choice_sign_and_encrypt">署名と暗号化</string>
+ <string name="choice_15secs">15秒</string>
+ <string name="choice_1min">1分</string>
+ <string name="choice_3mins">3分</string>
+ <string name="choice_5mins">5分</string>
+ <string name="choice_10mins">10分</string>
+ <string name="choice_20mins">20分</string>
+ <string name="choice_40mins">40分</string>
+ <string name="choice_1hour">1時間</string>
+ <string name="choice_2hours">2時間</string>
+ <string name="choice_4hours">4時間</string>
+ <string name="choice_8hours">8時間</string>
+ <string name="dsa">DSA</string>
+ <string name="elgamal">ElGamal</string>
+ <string name="rsa">RSA</string>
+ <string name="filemanager_title_open">開く...</string>
+ <string name="warning">注意</string>
+ <string name="error">エラー</string>
+ <string name="error_message">エラー: %s</string>
+ <!--sentences-->
+ <string name="wrong_passphrase">良くないパスフレーズ</string>
+ <string name="using_clipboard_content">クリップボードの内容を使う。</string>
+ <string name="set_a_passphrase">最初にパスフレーズを設定してください。</string>
+ <string name="no_filemanager_installed">互換性のないファイルマネージャがインストールされています。</string>
+ <string name="passphrases_do_not_match">パスフレーズが一致しません。</string>
+ <string name="passphrase_must_not_be_empty">空のパスフレーズは受け付けません。</string>
+ <string name="passphrase_for_symmetric_encryption">対称暗号。</string>
+ <string name="passphrase_for">\'%s\' にパスフレーズを入れてください。</string>
+ <string name="file_delete_confirmation">%s を削除してもかまいませんか?</string>
+ <string name="file_delete_successful">削除に成功しました。</string>
+ <string name="no_file_selected">最初にファイルを選択してください。</string>
+ <string name="decryption_successful">復号化に成功しました。</string>
+ <string name="encryption_successful">暗号化に成功しました。</string>
+ <string name="encryption_to_clipboard_successful">クリップボードの中身の暗号化に成功しました。</string>
+ <string name="enter_passphrase_twice">もう一度パスフレーズを入れてください。</string>
+ <string name="select_encryption_key">少なくとも1つの暗号鍵を選択して下さい。</string>
+ <!--errors
+ no punctuation, all lowercase,
+ they will be put after "error_message", e.g. "Error: file not found"-->
+ <!--progress dialogs, usually ending in '…'-->
+ <!--action strings-->
+ <!--key bit length selections-->
+ <!--compression-->
+ <!--Help-->
+ <!--Import-->
+ <!--Intent labels-->
+ <!--Remote API-->
+ <!--Share-->
+ <!--Key list-->
+ <!--Key view-->
+ <!--Navigation Drawer-->
+</resources>
diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
index b86db9d81..131e5aeeb 100644
--- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
@@ -136,7 +136,7 @@
<string name="unknown_status"></string>
<string name="can_encrypt">шифрование</string>
<string name="can_sign">подпись</string>
- <string name="expired">годен до</string>
+ <string name="expired">просрочен</string>
<string name="revoked">отозван</string>
<plurals name="n_key_servers">
<item quantity="one">%d сервер ключей</item>
@@ -273,6 +273,11 @@
<string name="error_expiry_must_come_after_creation">срок годности не может быть раньше даты создания</string>
<string name="error_can_not_delete_contact">нельзя удалить свой собственный контакт. Пожалуйста, удалите его в разделе \'Мои ключи\'!</string>
<string name="error_can_not_delete_contacts">это ваши собственные контакты, их нельзя удалить:\n%s</string>
+ <plurals name="error_can_not_delete_info">
+ <item quantity="one">Пожалуйста, удалите его в разделе \'Мои ключи\'!</item>
+ <item quantity="few">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item>
+ <item quantity="other">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item>
+ </plurals>
<!--progress dialogs, usually ending in '…'-->
<string name="progress_done">готово.</string>
<string name="progress_saving">сохранение...</string>
@@ -385,6 +390,8 @@
<!--Key view-->
<string name="key_view_action_encrypt">Зашифровать для этого получателя</string>
<string name="key_view_action_certify">Сертифицировать ключ этого контакта</string>
+ <string name="key_view_tab_main">Информация</string>
+ <string name="key_view_tab_certs">Сертификация</string>
<!--Navigation Drawer-->
<string name="nav_contacts">Контакты</string>
<string name="nav_encrypt">Зашифровать</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
index 0a00f5658..344ca0966 100644
--- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
@@ -390,6 +390,8 @@
<!--Key view-->
<string name="key_view_action_encrypt">Зашифрувати у цей контакт</string>
<string name="key_view_action_certify">Сертифікувати ключ цього контакту</string>
+ <string name="key_view_tab_main">Інформація</string>
+ <string name="key_view_tab_certs">Сертифікати</string>
<!--Navigation Drawer-->
<string name="nav_contacts">Контакти</string>
<string name="nav_encrypt">Зашифрувати</string>
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 3a719afed..88ad10a0a 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -373,7 +373,7 @@
<string name="intent_send_decrypt">OpenPGP: Decrypt</string>
<!-- Remote API -->
- <string name="api_no_apps">No registered applications!</string>
+ <string name="api_no_apps">No registered applications!\n\nThird-party applications can request access to OpenPGP Keychain. After granting access, they will be listed here.</string>
<string name="api_settings_show_advanced">Show advanced settings</string>
<string name="api_settings_hide_advanced">Hide advanced settings</string>
<string name="api_settings_no_key">No key selected</string>
@@ -383,7 +383,7 @@
<string name="api_settings_revoke">Revoke access</string>
<string name="api_settings_package_name">Package Name</string>
<string name="api_settings_package_signature">SHA-256 of Package Signature</string>
- <string name="api_register_text">The following application requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
+ <string name="api_register_text">The following application requests access to OpenPGP Keychain.\n\nAllow permanent access?</string>
<string name="api_register_allow">Allow access</string>
<string name="api_register_disallow">Disallow access</string>
<string name="api_register_error_select_key">Please select a key!</string>