aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-24 01:52:54 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-24 01:52:54 +0100
commit94dbeaeaf03ae16637a3cb8593850d4326458924 (patch)
tree27c1e3efc73c0f93eef66135f6eea8bd3c1d220a /OpenKeychain/src/main/res
parent7a83e34efe46111e77d383441b035ef91d69cd64 (diff)
downloadopen-keychain-94dbeaeaf03ae16637a3cb8593850d4326458924.tar.gz
open-keychain-94dbeaeaf03ae16637a3cb8593850d4326458924.tar.bz2
open-keychain-94dbeaeaf03ae16637a3cb8593850d4326458924.zip
support github resource (pa)
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/drawable/github.pngbin0 -> 1714 bytes
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml3
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/drawable/github.png b/OpenKeychain/src/main/res/drawable/github.png
new file mode 100644
index 000000000..8b25551a9
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/github.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 4902485b0..d353422d3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1178,6 +1178,7 @@
<string name="msg_lv_fetch_error">"Server error (HTTP %s)"</string>
<string name="msg_lv_fetch_error_url">"URL is malformed!"</string>
<string name="msg_lv_fetch_error_io">"IO Error!"</string>
+ <string name="msg_lv_fetch_error_format">"Format error!"</string>
<string name="msg_acc_saved">"Account saved"</string>
@@ -1307,6 +1308,7 @@
<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 Website has been fetched and verified."</string>
+ <string name="linked_verified_github">"The Gist has been fetched and verified."</string>
<string name="linked_verified_dns">"The DNS record has been fetched and verified."</string>
<string name="linked_verified_twitter">"The Tweet has been fetched and verified."</string>
<plurals name="linked_id_expand">
@@ -1317,6 +1319,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\nCookie 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\nCookie 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>