From fb0f3c4778660c3ad9353b80173d2ef2d3684219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 7 May 2014 10:59:16 +0200 Subject: [PATCH] Use paste icon, clarify language once again --- .../main/res/drawable-hdpi/ic_action_paste.png | Bin 0 -> 458 bytes .../main/res/drawable-mdpi/ic_action_paste.png | Bin 0 -> 348 bytes .../main/res/drawable-xhdpi/ic_action_paste.png | Bin 0 -> 494 bytes .../main/res/drawable-xxhdpi/ic_action_paste.png | Bin 0 -> 687 bytes .../src/main/res/layout/decrypt_file_fragment.xml | 2 +- .../main/res/layout/decrypt_message_fragment.xml | 4 ++-- OpenKeychain/src/main/res/values-de/strings.xml | 2 +- OpenKeychain/src/main/res/values/strings.xml | 7 ++++--- 8 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_paste.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_paste.png 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 0000000000000000000000000000000000000000..9438aa59779e180922559c1bc9048dfadbcfd0dd GIT binary patch literal 458 zcmV;*0X6=KP)monq+EN z?6A|bXe<_q#-g!c(WoWpSv2-$c}q${2pc=L`(V+<_rKVKE#lGOdkN^+P1I0q5#CS^LtW3bNVBI-JJa4yr55p9p90SHO<|j zxrCh~Y}~6p7}PK_BW>XBsDxHio}G7$__dK6ItJ3jG7%Trxj`hBa*z$^0mJ z7byh*PM%6~MJ7)~g`G%s1U?=5v}>WnZz276`IV$f%P3W-Ep$Pgm&uO;@P-aNW9L9D zx$tk2m;^9wp^%JpSD|NRI;#Lsi<~(d z0qp9-h9uTPp*H${+bJZNLK-P_Y}$dErjW2A0-d4|A7o4+wFgI&M5igl7a9h@ z0J?T3M*Uy9eyNX`LYgCx8*JKgkA;P$Ql0_~0K2Pqjc7PF4y0ApigE)b@~3`Pnp z_XScuQ0|tqXU}e?nggJ|k|ChC7-TV&4RS~?0rgLSj{Jr$$bv($4AcTr03r1t2i_vq z0mK3yO4AWR2LOXD9W8n?fs_Fb82@CgBEe%?$A2Ml-!j5>f| u8X(lB8@3_vgous?so=?IXBHa(2rvK+97O??ix@fp0000Y zUW-!!`o4}We{*xb+GnaLE#o&5_p9yA*MAH?KAC_o*v2;me)=N7B^I*s$Kz0g2uZ-? z2QwVB2}T8L1&HCSTNvj{$MBE88Jfi3#;$;Apl8E+fUdlmz}zCty~HtI@g_<*B;x@x z=v(QYq^;EKx*}HspC#s95(MaqnZ4X~k+af-DS8F?+|w5+5HRydz$9t{Onu)&HR<%# za=HtsQ?FA>g#LXd2mug4G2}c6>hf7@CkFbC0#a9itfKk2S>geBfLBziG!%dbpn&0e zKyP^g3cv$U0JQ)LzynY~61Biy6jq@CJOBki00ck)1V8`;KtLpkknR8UPyhr#KvEvi kBv9-$82|u)cK8-x0C*f~j2Z6fFaQ7m07*qoM6N<$f(MPwRR910 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3589aeb5556dcc94dff6da29caee9af5bb07ba4d GIT binary patch literal 687 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m;yar978H@y_vJopUF_9-T%>}wQF{5s^Xk%ti5L4F2S^L z_wdNh+5ef>?J$~XvAJrs_U82)RnD?ppp3AeeOFX{yrOb)S}R-SRYT^G`>H`h)T(PWwdt^PfI<%g&Auy$p3}|2|KA zuv=+Q%OuXd4MGV)od2e82^Y@!UFV`4aUKg-3`&t2uLO`CT-;naPzrPU3m zUmUq#$p675G5g;s&bmeh-EM)b3&|Re7aJHhPFL8Nby;fLwKbn@%xtEVOP=0!EaG0! znFgf^=X?Aaeg`~vW%zxQqd?_H+QHm6ABFh8aY{-@asKJ$-Shr|h?(#ip+n2>2v0l7 zt#HtQKk&P5{Iw~IHpbl6xpj7S#AVJ+ESjwMkEY!7F=n$p`r!N2=Kbjj<+moCZqUn} z)e|I=a6yrA(wPQ5S@n~Xg%)(DS8h4BB+2=0XKNc{CI%)21_g&jD{chHtG_&Q zD^Ku2NzI%k+@E$f2~A02yHRv-vVmj+!;}RPF#*g|q^b`a?p#ou`DBm1YKKq@w-U1e zLxJO|cWmNI-sEXGPEm*v04ko)!=2>rbDwpiGTROXBL;y6p(PKS&N-B>?T|Hmx>dsTciSZ22P T?2nRv1QPOe^>bP0l+XkK^(i0c literal 0 HcmV?d00001 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 @@ Zu beglaubigende Schlüssel Beglaubigen - Entschlüsselte Datei verifizieren und speichern + Entschlüsselte Datei verifizieren und speichern Aus der Zwischenablage Verschlüsselte Datei speichern Speichern 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 @@ Certify - Verify and save decrypted file + Decrypt, verify, and save file + Decrypt and verify message From Clipboard - Save encrypt file + Encrypt and save file Save Cancel Delete @@ -67,7 +68,7 @@ Lookup key Show advanced settings Hide advanced settings - Share encrypted/signed… + Share encrypted/signed message… Settings