Use paste icon, clarify language once again

8 files changed, 8 insertions, 7 deletions

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png
new file mode 100644
index 000000000..9438aa597
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png
new file mode 100644
index 000000000..940aae781
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png
new file mode 100644
index 000000000..5fa309cd8
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png
new file mode 100644
index 000000000..3589aeb55
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index b5fd1fcc0..d1db1c782 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -72,7 +72,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:text="@string/btn_decrypt_verify"
+                    android:text="@string/btn_decrypt_verify_file"
                     android:clickable="true"
                     style="@style/SelectableItem"
                     android:drawableRight="@drawable/ic_action_save"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
index e54edd0d1..0db581910 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
@@ -58,7 +58,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:text="@string/btn_decrypt_verify"
+                    android:text="@string/btn_decrypt_verify_message"
                     android:gravity="center_vertical"
                     android:layout_weight="1" />
 
@@ -75,7 +75,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:padding="8dp"
-                    android:src="@drawable/ic_action_copy"
+                    android:src="@drawable/ic_action_paste"
                     android:layout_gravity="center_vertical"
                     style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 4b355f46f..41831f8df 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -46,7 +46,7 @@
   <string name="section_key_to_certify">Zu beglaubigende Schlüssel</string>
   <!--button-->
   <string name="btn_certify">Beglaubigen</string>
-  <string name="btn_decrypt_verify">Entschlüsselte Datei verifizieren und speichern</string>
+  <string name="btn_decrypt_verify_file">Entschlüsselte Datei verifizieren und speichern</string>
   <string name="btn_decrypt_verify_clipboard">Aus der Zwischenablage</string>
   <string name="btn_encrypt_file">Verschlüsselte Datei speichern</string>
   <string name="btn_save">Speichern</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6df7cdcf2..11ca869ff 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -49,9 +49,10 @@
 
     <!-- button -->
     <string name="btn_certify">Certify</string>
-    <string name="btn_decrypt_verify">Verify and save decrypted file</string>
+    <string name="btn_decrypt_verify_file">Decrypt, verify, and save file</string>
+    <string name="btn_decrypt_verify_message">Decrypt and verify message</string>
     <string name="btn_decrypt_verify_clipboard">From Clipboard</string>
-    <string name="btn_encrypt_file">Save encrypt file</string>
+    <string name="btn_encrypt_file">Encrypt and save file</string>
     <string name="btn_save">Save</string>
     <string name="btn_do_not_save">Cancel</string>
     <string name="btn_delete">Delete</string>
@@ -67,7 +68,7 @@
     <string name="btn_lookup_key">Lookup key</string>
     <string name="btn_encryption_advanced_settings_show">Show advanced settings</string>
     <string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string>
-    <string name="btn_share_encrypted_signed">Share encrypted/signed…</string>
+    <string name="btn_share_encrypted_signed">Share encrypted/signed message…</string>
 
     <!-- menu -->
     <string name="menu_preferences">Settings</string>