use ViewAnimator for progress, streamline text on first step

1 files changed, 18 insertions, 20 deletions

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 47a354081..6611390ce 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1272,33 +1272,30 @@
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
 
-    <string name="linked_create_https_1_1">"You can link your key to a website you control. Note that your server must have a valid https certificate!"</string>
-    <string name="linked_create_https_1_2">"Please enter the url where you are able to place a text file for proof:"</string>
-    <string name="linked_create_https_1_3">"Example: https://example.com/pgpkey.txt"</string>
-    <string name="linked_create_https_1_4">"In the next step, a text file will be generated, which you will be asked to upload to the uri. This file links back to your pgp key, to make the connection verifiable in both directions."</string>
+    <string name="linked_create_https_1_1">"By creating a Linked Identity of this type, you can link your key to a website you control."</string>
+    <string name="linked_create_https_1_2">"To do this, you publish a text file on this website, then create a Linked Identity which links to it."</string>
+    <string name="linked_create_https_1_3">"Please enter a URL where you are able to place a text file for proof. Note that your server must support https and have a valid TLS certificate!"</string>
+    <string name="linked_create_https_1_4">"Example: https://example.com/pgpkey.txt"</string>
     <string name="linked_create_https_created">"The proof file has been created. For the next step, you should save and upload it to the URI you indicated:"</string>
     <string name="linked_create_https_2_1">"A proof file for this URI has been created:"</string>
     <string name="linked_create_https_2_2">"For the next step, you should save and upload this file."</string>
     <string name="linked_create_https_2_3">"Make sure the file is reachable at the correct URI, then verify your setup."</string>
     <string name="linked_create_https_2_4">"After verification is successful, hit next to add the linked identity to your keyring and finish the process."</string>
 
-    <string name="linked_create_twitter_1_1">"You can link your pgp key to your account on Twitter. Please enter your username:"</string>
-    <string name="linked_create_twitter_1_2">"A message will be generated in the next step, which you can then customize and finally publish to your timeline."</string>
-    <string name="linked_create_twitter_1_3">"This tweet links back to your pgp key, to make the connection verifiable in both directions."</string>
+    <string name="linked_create_twitter_1_1">"By creating a Linked Identity of this type, you can link your key to a Twitter account you control."</string>
+    <string name="linked_create_twitter_1_2">"To do this, you publish a specific Tweet on your timeline, then create a Linked Identity which links to this tweet."</string>
+    <string name="linked_create_twitter_1_3">"Please enter your Twitter screen name to proceed."</string>
     <string name="linked_create_twitter_handle">Twitter Handle</string>
-    <string name="linked_create_twitter_2_1">"A message for this Twitter account has been created. You can add some text in front if you like, or leave it as-is."</string>
-    <string name="linked_create_twitter_2_2">"Here's a preview of the full tweet:"</string>
-    <string name="linked_create_twitter_2_3">"Once you are happy with the tweet, click next to proceed."</string>
-    <string name="linked_create_twitter_3_1">"Alright, here's the finished text:"</string>
-    <string name="linked_create_twitter_3_2">"Tweet the message using either method."</string>
-    <string name="linked_create_twitter_3_3">"After the tweet is published, hit the button to verify that everything is correct"</string>
-    <string name="linked_create_twitter_3_4">"Next"</string>
-
-    <string name="linked_create_dns_1_1">"You can link your key to a domain name you control by publishing a special TXT record."</string>
-    <string name="linked_create_dns_1_2">"A linked identity of this type is especially useful if the email address you use is at the same domain."</string>
-    <string name="linked_create_dns_1_3">"Please enter a fully qualified domain name:"</string>
+    <string name="linked_create_twitter_2_1">"This is the text for your Tweet:"</string>
+    <string name="linked_create_twitter_2_2">"You may add more text to the Tweet, so long as the text inside the brackets is unmodified. Tweet this message using either method."</string>
+    <string name="linked_create_twitter_2_3">"Once your Tweet is published, click the button below to scan your timeline for it."</string>
+    <string name="linked_create_twitter_2_4">"Next"</string>
+
+    <string name="linked_create_dns_1_1">"By creating a Linked Identity of this type, you can link your key to a domain name you control."</string>
+    <string name="linked_create_dns_1_2">"To do this, you create a specific TXT record for the domain, then create a Linked Identity which links to this record."</string>
+    <!-- An Identity of this type is especially appropriate if your email address is at the same domain. -->
+    <string name="linked_create_dns_1_3">"Please enter a fully qualified domain name to proceed."</string>
     <string name="linked_create_dns_1_4">"Example: subdomain.example.com"</string>
-    <string name="linked_create_dns_1_5">"In the next step, a message will be generated which you will be asked to publish as a TXT record. This record then links back to your pgp key, to make the connection verifiable in both directions."</string>
     <string name="linked_create_dns_2_1">"Your proof text:"</string>
     <string name="linked_create_dns_2_2">"For the next step, bla bla"</string>
     <string name="linked_create_dns_2_3">"More bla:"</string>
@@ -1308,13 +1305,14 @@
     <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_verifying">Verifying…</string>
-    <string name="linked_verify_success">Verification successful!</string>
+    <string name="linked_verify_success">Verified!</string>
     <string name="linked_verify_error">Verification error!</string>
     <string name="linked_verify_pending">Not yet verified</string>
     <string name="linked_need_verify">The resource needs to be verified before you can proceed!</string>
     <string name="menu_linked_add_identity">"Add Linked Identity"</string>
     <string name="section_linked_identities">Linked Identities</string>
     <string name="btn_link_identity">Link Identity</string>
+    <string name="linked_create_verify">Verify</string>
     <plurals name="linked_id_expand">
         <item quantity="one">"There is one more unknown identity type"</item>
         <item quantity="other">"There are %d more unknown identity types"</item>