diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
4 files changed, 15 insertions, 15 deletions
diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html index b11adda4d..0faf0eb5e 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html @@ -6,7 +6,7 @@ <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 key servers directly from the import screen</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> 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 583ee25f4..d42a1fbfd 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html @@ -6,7 +6,7 @@ <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 key servers directly from the import screen</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> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html index 7bb558a24..17ad853de 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html @@ -10,7 +10,7 @@ And don't add newlines before or after p tags because of transifex --> <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 key servers directly from the import screen</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> @@ -55,7 +55,7 @@ And don't add newlines before or after p tags because of transifex --> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<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> diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 559b04469..ce919c8f0 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ <string name="title_edit_key">Edit Key</string> <string name="title_preferences">Preferences</string> <string name="title_api_registered_apps">Registered Applications</string> - <string name="title_key_server_preference">Key Server Preference</string> + <string name="title_key_server_preference">Keyserver Preference</string> <string name="title_change_pass_phrase">Change Passphrase</string> <string name="title_set_passphrase">Set Passphrase</string> <string name="title_send_email">"Send Mail…"</string> @@ -23,8 +23,8 @@ <string name="title_export_key">Export Key</string> <string name="title_export_keys">Export Keys</string> <string name="title_key_not_found">Key Not Found</string> - <string name="title_key_server_query">Query Key Server</string> - <string name="title_send_key">Upload to Key Server</string> + <string name="title_key_server_query">Query Keyserver</string> + <string name="title_send_key">Upload to Keyserver</string> <string name="title_unknown_signature_key">Unknown Signature Key</string> <string name="title_certify_key">Certify Key</string> <string name="title_key_details">Key Details</string> @@ -41,7 +41,7 @@ <string name="section_actions">Actions</string> <string name="section_certification_key">Your Key used for certification</string> <string name="section_upload_key">Upload Key</string> - <string name="section_key_server">Key Server</string> + <string name="section_key_server">Keyserver</string> <string name="section_encrypt_and_or_sign">Encrypt and/or Sign</string> <string name="section_decrypt_verify">Decrypt and Verify</string> @@ -60,7 +60,7 @@ <string name="btn_change_passphrase">Change Passphrase</string> <string name="btn_set_passphrase">Set Passphrase</string> <string name="btn_search">Search</string> - <string name="btn_export_to_server">Upload To Key Server</string> + <string name="btn_export_to_server">Upload To Keyserver</string> <string name="btn_next">Next</string> <string name="btn_back">Back</string> <string name="btn_clipboard">Clipboard</string> @@ -80,8 +80,8 @@ <string name="menu_create_key">Create key</string> <string name="menu_create_key_expert">Create key (expert)</string> <string name="menu_search">Search</string> - <string name="menu_key_server">Import from key server</string> - <string name="menu_update_key">Update from key server</string> + <string name="menu_key_server">Import from keyserver</string> + <string name="menu_update_key">Update from keyserver</string> <string name="menu_export_key_to_server">Upload to key server</string> <string name="menu_share">Share</string> <string name="menu_share_title_fingerprint">Share fingerprint…</string> @@ -117,7 +117,7 @@ <string name="label_message_compression">Message Compression</string> <string name="label_file_compression">File Compression</string> <string name="label_force_v3_signature">Force V3 Signatures</string> - <string name="label_key_servers">Key Servers</string> + <string name="label_key_servers">Keyservers</string> <string name="label_key_id">Key ID</string> <string name="label_creation">Creation</string> <string name="label_expiry">Expiry</string> @@ -127,7 +127,7 @@ <string name="label_name">Name</string> <string name="label_comment">Comment</string> <string name="label_email">Email</string> - <string name="label_send_key">Upload key to selected key server after certification</string> + <string name="label_send_key">Upload key to selected keyserver after certification</string> <string name="label_fingerprint">Fingerprint</string> <string name="select_keys_button_default">Select</string> @@ -146,8 +146,8 @@ <string name="revoked">revoked</string> <plurals name="n_key_servers"> - <item quantity="one">%d key server</item> - <item quantity="other">%d key servers</item> + <item quantity="one">%d keyserver</item> + <item quantity="other">%d keyservers</item> </plurals> <string name="fingerprint">Fingerprint:</string> |