aboutsummaryrefslogtreecommitdiffstats
path: root/APG/res/values/strings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'APG/res/values/strings.xml')
-rw-r--r--APG/res/values/strings.xml14
1 files changed, 9 insertions, 5 deletions
diff --git a/APG/res/values/strings.xml b/APG/res/values/strings.xml
index 709b6da0d..531e1cd68 100644
--- a/APG/res/values/strings.xml
+++ b/APG/res/values/strings.xml
@@ -45,10 +45,10 @@
<string name="title_keyServerQuery">Query Key Server</string>
<string name="title_sendKey">Export to Key Server</string>
<string name="title_unknownSignatureKey">Unknown Signature Key</string>
- <string name="title_importFromQRCode">Import from QR Code</string>
<string name="title_signKey">Sign Keyring</string>
<string name="title_about">About</string>
<string name="title_help">Help</string>
+ <string name="title_shareByNfc">Share keyring with NFC</string>
<!-- section_lowerCase: capitalized words, no punctuation -->
<string name="section_userIds">User IDs</string>
@@ -99,12 +99,14 @@
<string name="menu_editKey">Edit Keyring</string>
<string name="menu_search">Search</string>
<string name="menu_help">Help</string>
- <string name="menu_keyServer">Key Server</string>
+ <string name="menu_keyServer">Query Key Server</string>
<string name="menu_updateKey">Update from Server</string>
<string name="menu_exportKeyToServer">Export To Server</string>
- <string name="menu_share">Share public keyring with QR Code</string>
+ <string name="menu_shareQrCode">Share with QR Code</string>
+ <string name="menu_shareNfc">Share with NFC</string>
<string name="menu_scanQRCode">Scan QR Code</string>
<string name="menu_signKey">Sign Key</string>
+ <string name="menu_BeamPreferences">Beam Settings</string>
<!-- label_lowerCase: capitalized words, no punctuation -->
<string name="label_sign">Sign</string>
@@ -262,6 +264,8 @@
<string name="error_savingKeys">error saving some key(s)</string>
<string name="error_couldNotExtractPrivateKey">could not extract private key</string>
<string name="error_onlyFilesAreSupported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
+ <string name="error_jellyBeanNeeded">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string>
+ <string name="error_nfcNeeded">NFC is not available on your device!</string>
<!-- progress_lowerCase: lowercase, phrases, usually ending in '…' -->
<string name="progress_done">done.</string>
@@ -329,10 +333,11 @@
<string name="dashboard_encrypt">Encrypt</string>
<string name="dashboard_decrypt">Decrypt</string>
<string name="dashboard_help">Help</string>
- <string name="dashboard_scan_qrcode">Scan QRCode</string>
+ <string name="dashboard_import_keys">Import Keys</string>
<!-- Help -->
<string name="help_tab_start">Start</string>
+ <string name="help_tab_nfc_beam">NFC Beam</string>
<string name="help_tab_changelog">Changelog</string>
<string name="help_tab_about">About</string>
<string name="help_about_version">Version:</string>
@@ -340,7 +345,6 @@
<!-- Import from QR Code -->
<string name="import_from_qr_code_import">Import keyring (only locally)</string>
<string name="import_from_qr_code_import_sign_and_upload">Import, Sign, and upload keyring</string>
- <string name="import_from_qr_code_scan_again">Scan QR Code again</string>
<string name="import_from_qr_code_finish">Finish</string>
<!-- Intent labels -->