Merge branch 'master' of github.com:open-keychain/open-keychain

5 files changed, 10 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
index e1c8db383..7fa581905 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
@@ -156,7 +156,7 @@
                     android:drawableLeft="@drawable/ic_repeat_black_24dp"
                     android:drawableStart="@drawable/ic_repeat_black_24dp"
                     android:drawablePadding="12dp"
-                    android:text="@string/linked_button_retry"
+                    android:text="@string/linked_button_retry_step"
                     android:id="@+id/button_retry"
                     />
 
diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml
index e4fe58551..d6e437dd5 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml
@@ -6,7 +6,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:singleLine="true"
-    android:background="#ffffff"
     tools:showIn="@layout/linked_id_view_fragment">
 
     <ImageView
diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
index 377ce4fb6..8b275fcef 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
@@ -14,7 +14,7 @@
         android:transitionName="card_linked_ids"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        card_view:cardBackgroundColor="@android:color/white"
+        card_view:cardBackgroundColor="?attr/colorCardViewBackground"
         card_view:cardElevation="2dp"
         card_view:cardUseCompatPadding="true"
         card_view:cardCornerRadius="4dp">
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 5bf36f564..8715945bf 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         tools:visibility="visible"
-        card_view:cardBackgroundColor="@android:color/white"
+        card_view:cardBackgroundColor="?attr/colorCardViewBackground"
         card_view:cardElevation="2dp"
         card_view:cardUseCompatPadding="true"
         card_view:cardCornerRadius="4dp">
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 9c2d1a2b0..ea34a77a5 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -435,6 +435,7 @@
     <string name="progress_encrypting">"encrypting data…"</string>
     <string name="progress_decrypting">"decrypting data…"</string>
     <string name="progress_preparing_signature">"preparing signature…"</string>
+    <string name="progress_processing_signature">processing signature…</string>
     <string name="progress_generating_signature">"generating signature…"</string>
     <string name="progress_verifying_signature">"verifying signature…"</string>
     <string name="progress_signing">"signing…"</string>
@@ -1629,7 +1630,8 @@
     <string name="linked_title_twitter">"Twitter"</string>
     <string name="card_linked_identity">"Linked Identity"</string>
     <string name="linked_button_verify">"Verify"</string>
-    <string name="linked_button_retry">"Retry last step"</string>
+    <string name="linked_button_retry">"Retry"</string>
+    <string name="linked_button_retry_step">"Retry last step"</string>
     <string name="linked_button_confirm">"Confirm"</string>
     <string name="linked_button_view">"View"</string>
     <string name="linked_text_verifying">"Verifying…"</string>
@@ -1661,10 +1663,14 @@
     <string name="snack_backup_exists">"Backup already exists!"</string>
     <string name="snack_backup_saved_dir">"Saved to OpenKeychain directory"</string>
     <string name="btn_backup_back">Go back to check</string>
+    <string name="snack_text_too_long">"Text is too long to show in full!"</string>
+    <string name="snack_shared_text_too_long">"Shared text was cut because it was too long!"</string>
 
     <string name="share_log_dialog_title">"Share log?"</string>
     <string name="share_log_dialog_message">"While logs can be super helpful for developers to find bugs in OpenKeychain, they can contain potential sensitive information such as data about the updated keys. Please make sure you are okay with sharing this information."</string>
     <string name="share_log_dialog_share_button">"Share"</string>
     <string name="share_log_dialog_cancel_button">"Cancel"</string>
+    <string name="toast_wrong_mimetype">"Wrong data type, expected text!"</string>
+    <string name="toast_no_text">"No text in shared data!"</string>
 
 </resources>