aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-08-31 14:24:09 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-08-31 14:24:13 +0200
commit261c83043b4e2c7116f11bacf2e58682e68fd65c (patch)
tree07560fad12cf23e32ddbce259f68be2e7035dc1e
parent36f8e9f56369e8514348ba13679ceca40b8ed9d0 (diff)
downloadopen-keychain-261c83043b4e2c7116f11bacf2e58682e68fd65c.tar.gz
open-keychain-261c83043b4e2c7116f11bacf2e58682e68fd65c.tar.bz2
open-keychain-261c83043b4e2c7116f11bacf2e58682e68fd65c.zip
linked: Github -> GitHub (fixes #1513)
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 7bfbfdb13..7ff148e28 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -198,7 +198,7 @@
<string name="label_experimental_settings_word_confirm_title">"Word Confirm"</string>
<string name="label_experimental_settings_word_confirm_summary">"Confirm keys with words instead of hexadecimal fingerprints"</string>
<string name="label_experimental_settings_linked_identities_title">"Linked Identities"</string>
- <string name="label_experimental_settings_linked_identities_summary">"Link keys to Twitter, Github, websites or DNS (similar to keybase.io but decentralized)"</string>
+ <string name="label_experimental_settings_linked_identities_summary">"Link keys to Twitter, GitHub, websites or DNS (similar to keybase.io but decentralized)"</string>
<string name="label_experimental_settings_keybase_title">"Keybase.io Proofs"</string>
<string name="label_experimental_settings_keybase_summary">"Contact keybase.io for key proofs and show them every time a key is displayed"</string>
<string name="label_experimental_settings_theme_summary">"(The icons and many screens are not yet adjusted accordingly for the dark theme)"</string>
@@ -1344,7 +1344,7 @@
<string name="msg_lv_error_twitter_auth">"Error obtaining Twitter auth token!"</string>
<string name="msg_lv_error_twitter_handle">"Twitter account handle mismatch in response!"</string>
<string name="msg_lv_error_twitter_response">"Unexpected response from Twitter API!"</string>
- <string name="msg_lv_error_github_handle">"Github account handle mismatch in response!"</string>
+ <string name="msg_lv_error_github_handle">"GitHub account handle mismatch in response!"</string>
<string name="msg_lv_error_github_not_found">"Gist contains no matching files!"</string>
<string name="msg_lv_fetch">"Fetching URI '%s'"</string>
@@ -1565,10 +1565,10 @@
<string name="linked_create_twitter_2_3">"Once your Tweet is published as &lt;b&gt;@%s&lt;/b&gt;, click the Verify button to scan your timeline for it."</string>
<string name="linked_create_twitter_2_4">"After successful verification, press the Finish button to add the Linked Identity to your keyring and finish the process."</string>
- <string name="linked_create_github_1_1">"By creating a Linked Identity of this type, you can link your key to a Github account you control."</string>
+ <string name="linked_create_github_1_1">"By creating a Linked Identity of this type, you can link your key to a GitHub account you control."</string>
<string name="linked_create_github_1_2">"To do this, you publish a specific Gist on your timeline, then create a Linked Identity which links to this Gist."</string>
- <string name="linked_create_github_1_3">"Please enter your Github screen name to proceed."</string>
- <string name="linked_create_github_handle">Github Handle</string>
+ <string name="linked_create_github_1_3">"Please enter your GitHub screen name to proceed."</string>
+ <string name="linked_create_github_handle">GitHub Handle</string>
<string name="linked_create_github_2_1">"Click either button to post the gist!"</string>
<string name="linked_create_github_2_2">"You can edit the Gist before posting it, so long as the text inside the brackets is unmodified."</string>
<string name="linked_create_github_2_3">"Once your Gist is published, click the Verify button to scan your timeline for it."</string>
@@ -1587,11 +1587,11 @@
<string name="linked_create_verify">"Verify"</string>
<string name="linked_text_clipboard">Text has been copied to clipboard</string>
<string name="linked_verified_https">"The link between this Website and key was securely verified. <b>If you believe the Website is genuine</b>, confirm this verification with your key."</string>
- <string name="linked_verified_github">"The link between this Github account and key was securely verified. <b>If you believe the account is genuine</b>, confirm this verification with your key."</string>
+ <string name="linked_verified_github">"The link between this GitHub account and key was securely verified. <b>If you believe the account is genuine</b>, confirm this verification with your key."</string>
<string name="linked_verified_dns">"The link between this Domain Name and key was securely verified. <b>If you believe the Domain is genuine</b>, confirm this verification with your key."</string>
<string name="linked_verified_twitter">"The link between this Twitter account and key was securely verified. <b>If you believe the account is genuine</b>, confirm this verification with your key."</string>
<string name="linked_verified_secret_https">"The link between your Website and key was securely verified. Everything looks in order."</string>
- <string name="linked_verified_secret_github">"The link between your Github account and key was securely verified. Everything looks in order."</string>
+ <string name="linked_verified_secret_github">"The link between your GitHub account and key was securely verified. Everything looks in order."</string>
<string name="linked_verified_secret_dns">"The link between your Domain Name and key was securely verified. Everything looks in order."</string>
<string name="linked_verified_secret_twitter">"The link between this Twitter account and key was securely verified. Everything looks in order."</string>
@@ -1603,7 +1603,7 @@
<string name="linked_select_1">"A \'linked identity\' connects your pgp key to a resource on the web."</string>
<string name="linked_select_2">"Please select a type:"</string>
<string name="linked_id_generic_text">"This file claims ownership of the OpenPGP key with long id %2$s.\n\nToken for proof:\n%1$s"</string>
- <string name="linked_id_github_text">"This Gist confirms the Linked Identity in my OpenPGP key, and links it to this Github account.\n\nToken for proof:\n%1$s"</string>
+ <string name="linked_id_github_text">"This Gist confirms the Linked Identity in my OpenPGP key, and links it to this GitHub account.\n\nToken for proof:\n%1$s"</string>
<string name="linked_verifying">"Verifying…"</string>
<string name="linked_verify_success">"Verified!"</string>
<string name="linked_verify_error">"Verification error!"</string>
@@ -1614,7 +1614,7 @@
<string name="btn_finish">"Finish"</string>
<string name="linked_title_https">Website (HTTPS)</string>
<string name="linked_title_dns">Domain Name (DNS)</string>
- <string name="linked_title_github">Github</string>
+ <string name="linked_title_github">GitHub</string>
<string name="linked_title_twitter">Twitter</string>
<string name="card_linked_identity">Linked Identity</string>
<string name="linked_button_verify">Verify</string>