From cac0f8ec9e6c7a7cfeda58efb24d87e28be8aa38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 27 Aug 2015 15:15:07 +0200 Subject: [PATCH] Prettify settings, rename some strings --- Graphics/get-material-icons.sh | 7 ++++ .../res/drawable-hdpi/ic_cloud_black_24dp.png | Bin 0 -> 296 bytes .../drawable-hdpi/ic_extension_black_24dp.png | Bin 0 -> 329 bytes .../ic_settings_ethernet_black_24dp.png | Bin 0 -> 350 bytes .../res/drawable-hdpi/ic_sync_black_24dp.png | Bin 0 -> 368 bytes .../res/drawable-mdpi/ic_cloud_black_24dp.png | Bin 0 -> 212 bytes .../drawable-mdpi/ic_extension_black_24dp.png | Bin 0 -> 224 bytes .../ic_settings_ethernet_black_24dp.png | Bin 0 -> 253 bytes .../res/drawable-mdpi/ic_sync_black_24dp.png | Bin 0 -> 250 bytes .../drawable-xhdpi/ic_cloud_black_24dp.png | Bin 0 -> 357 bytes .../ic_extension_black_24dp.png | Bin 0 -> 331 bytes .../ic_settings_ethernet_black_24dp.png | Bin 0 -> 447 bytes .../res/drawable-xhdpi/ic_sync_black_24dp.png | Bin 0 -> 467 bytes .../drawable-xxhdpi/ic_cloud_black_24dp.png | Bin 0 -> 518 bytes .../ic_extension_black_24dp.png | Bin 0 -> 495 bytes .../ic_settings_ethernet_black_24dp.png | Bin 0 -> 649 bytes .../drawable-xxhdpi/ic_sync_black_24dp.png | Bin 0 -> 669 bytes .../drawable-xxxhdpi/ic_cloud_black_24dp.png | Bin 0 -> 669 bytes .../ic_extension_black_24dp.png | Bin 0 -> 605 bytes .../ic_settings_ethernet_black_24dp.png | Bin 0 -> 894 bytes .../drawable-xxxhdpi/ic_sync_black_24dp.png | Bin 0 -> 875 bytes .../src/main/res/layout/key_list_fragment.xml | 6 +-- OpenKeychain/src/main/res/values/strings.xml | 37 +++++++++++------- .../main/res/xml/experimental_preferences.xml | 9 +++++ .../src/main/res/xml/preference_headers.xml | 13 +++++- 25 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_extension_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_sync_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_extension_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_settings_ethernet_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_sync_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_extension_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_ethernet_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_extension_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_ethernet_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_extension_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_ethernet_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 758ddc8aa..cc0bc9137 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -63,3 +63,10 @@ python copy OpenKeychain action white delete 24 # yubikey dialog python copy OpenKeychain action black check_circle 48 + +# preference header +python copy OpenKeychain file black cloud 24 # cloud +python copy OpenKeychain action black lock 24 # password settings +python copy OpenKeychain action black settings_ethernet 24 # proxy +python copy OpenKeychain notification black sync 24 # sync +python copy OpenKeychain action black extension 24 # experimental diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c3445cb8d0d9cff80de504dbc3c2850ee7f483b0 GIT binary patch literal 296 zcmV+@0oVSCP)b+2MXPb6E^6JzK&w`CfDrpV#O z0#FkCk`x0000W?=5Dh@j_`cQ|abA3wu3butzy#4M-Cr$Z_f;0XEhnFW&RBaV9{Be*udE0hz> zGBxsvD%5o@4Jwofu*ncHcpOUIB1U)cGBSq_@FHgO)X;xuZETrc?xI6oa+=|hnd1^M z8625a-i@i?$Xpvk!I3#Phw6BkVqgw!;UP0;I=-*j=hYPHbI1%1?XhPJe*G`fqr(+% z#X>JsDFLv;MUhaI3G>{ihI(q;v)It1de&C=bwpXiOG`aFQTMXCKe2?DX<9r)hDO}5 b!QbHnk!^L_GsV^<00000NkvXXu0mjf4w;Fj literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c97350f3f3d62304b4a179d0cf6048e8b353ab47 GIT binary patch literal 350 zcmV-k0iphhP)8`vauTDR*Lv>42254f{2KUMf4(pR!J4Th-jgLM-U3)=OGkNpc_XRp3M~J zB?{f;w+fx7$;>+s6H%+pQPRLNO-YW8lv^Aln#3${k7G!R=^TgSn+;;Ne8N#;I8>;> za;#K`h;_bv;F1JO!ocS~S>qQgeE8)DW&qnP&p!Lk5@T{+{n8tYRI#kjK9PlYHPmKT zsj8(xT$2FO*ZB6qYg16rjz0%i(?dG?p$}5%?yP5k3;lC9e9`H@U$irRw9cQ7b`%~> z!?v1Xw(g1~Y{rY4VPF4v>mJD>&CrrTpEX+73O5^7p>+ouUl&WM)Eb%707*qoM6N<$f*yvKGXMYp literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_sync_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_sync_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ebdbd072989517b8c6230f65f7064d7c2ac017 GIT binary patch literal 368 zcmV-$0gwKPP)Bnh6NK+0$5`HOv#KS=tYj%F$hmx(`HEa6MGCz zVd+xXR3C*q>XmoYu)EvRqLNoKN9vrWebtl-5=snnE8-`=ITW?{ z>(i^JcHZkdQ}U?&+TIegNA}*Gc`k>x+RLuCc`>Q^*!pue-Hg*2=2Qqa-^+<*oGOva z$3Ai46XWcF=Y02WKIeN^zopr02Gy2asU7T literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_extension_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_extension_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..075d6ca150c8f44af2af6ca7ebcd13bdc750975a GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i<(@8%Ar*{!CpmH*G7xaRM+ zTwrgX$orRvdc`%o%tO5oTHnZH7MmjA=+z|Y)8usjzUpVOnezYAT~AI{_7>7Kd@tkS z!r!DOm@J&&-2HP_pA5g@yQN1DA2He&Q0V5$aCFvxiopc60Bsj XiIy;0yS4u!(8&y*u6{1-oD!M<_Yw|r|GOT|XK?%xDIsUJ9VAx!B$oNEPTjCCUMHOLgs0@uOIM+hc=c_OeCtYY$lmfH>|_qY(a5Lp zBC`?BMt+0`nYqvz>4i$B5_%&SVO?^iM%c@|3GYT~gU&Mf*o80860LBx0>q!>QEKKS zbPhJ=;$MP1X$|6brX|#l&bsLVpmeTu&enbW0-8ozYX{n?_5c6?07*qoM6N<$f=D}Y AIRF3v literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b688b314609b4b0c2e7a8e5a7b45f0a0da55e84a GIT binary patch literal 357 zcmV-r0h<1aP)KNy_zl-`V{=3pjAz_o%C@E7)mQJom}WA1hNIJ<-)tN#{H;7ymJJ-&qGX@JsA4 zbxr9SUWfvoIi*Am??gdw%Zzv_iu2T--4uJeO7YH{i#<)8QJ_oi`d}tXxX11~GPx*i zqPctP3vr;!wsu=oU}#GNQHiC`Ug>FU?tURE^+nfOnMmNF6F^5Ul6V9hi)4B*63Kki z@+b#}xOC*e>X!pkIWWNC43jiVp{uU_l2#45I)5002ovPDHLkV1hGvjq3ma literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_ethernet_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_ethernet_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..306338a7784fe8b896fa774a8044daa3f12dd6f9 GIT binary patch literal 447 zcmV;w0YLtVP)&5P8Q^!P|8jU`3Dfm%7~FI`B5}% z{fg0~88ffVv(h=;_r7!N&gWU(_kF(i)IIk+@6l?tTIIHyF)r7BFKi*-u;-F_Q*xa0 zTQXxe=j5G%h$`5C<(pa@Hm_R(mEzoi?a5BI}8sN;gG|%Sv1kdDm6AAhzAtRif*m z6m^~uj#-MW*VZXD;%$7(l1UK8%*Do6J0PT}+|TUtJ=T8OBaE7j#YKl$(FHi-PprPT zfsUrFQem&=f1)3DH-D4YdnazPiTc0k16?JCJd&c$sc>V35873ccdc$zJXJm_&WfzZ zdiBHZW8ttnY%!7_Y;1m9@AU28$E)6nfe)M!Zz={v){%KvM?XXLBd(c4f1+kcH~88z pWnMC^_y1nJ#!VYls?}<>{sOan4IUb`@N578002ovPDHLkV1mRu*1P}! literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..860a5db38b393009a7407ced8d9fec8da0b460e1 GIT binary patch literal 467 zcmV;^0WAKBP)Y8m235b4thfjq5s2xGL-&my=8Y}rO#iqNL_sAt7# zbGQi8aPN&dD}Q(UKmQ-YoO`)AM%MLWT`$)4VqGuR^3-I(3JalY4Vwc%W0i@p9B?ix{5h)DbUhjrRWQ zC$I66YjjKu6StQJ zPo5IU6w&jpC@59DAecvdaf&5rK~PjglW}m0Jwp-{q$)-COd;&Jrcaw1Qk^1WgA`Ad ziaHZcwhG9|xiJ$cDFbG#IB*wVAB%B4*7aD|V_lDRJ&d?8{sN$?X^Ds6w;2Ec002ov JPDHLkV1g1j%<2FD literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..13c994e7d3a63d7d5c13f411bc309aaeac51fa7d GIT binary patch literal 518 zcmV+h0{Q)kP)py4+8ly$0lzxFtEfO`n<2(4i@NPu}79l}6L}Wori%AeI zCS(alLs~;WhJ4c~iY9-=)f^Afqn_tEH+4SWf8gTW=e};GKUk?$DwTHVb-{hFe6?!D z7cY%F@38F}tm3F~%VLd|jOo*?A({<%D{APCQ}rKezvrU%%-E-HGXGi?>ulBEn$$tN zyJCagu|>|dnGl=kp*A_Hcpx^}Jr%jRCUWSqob-#FIwA)fUiR+GScapwU{d_pE40@718qQ_-+y zjrq?3O*w3vTzl;=tyJq4h4oH%_1>8ig?3H`04GJ^U6%pySR~LzfG&|py}((KNdN1A zTOyhMfoCF_7FGBp5~_z~kx)aa4K$hBk$qrBB-9c&Qyb{CNT>z6Qv0cSl-9N9L|TiH z%xp4GM+j0qD6H#z|e$wfMD6mVabea+cbz4TYR>K8-oy?jJHu&h~ z_4$R&F%u2iJA*pZXtx13O#5gl_ZNM^q#-?8luD&isr1|V0Y!Twlos|68~^|S07*qo IM6N<$f&tp@n*aa+ literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_extension_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_extension_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..25c6154a1782845b851a4e0ee6a7d4bbdeabb72a GIT binary patch literal 495 zcmV$Od{q9(p!I^prCJ4D!q^vTO=d|B1rN$@kYH)%nJx6v9a?Cg6K%1m^kL5 z&K5)jQP0eV*&Kh)S}(9TGdJHR@V`*yfC)=Jv*Zc4sN$8Y#K;f6;EKT=w;` zV&s>eQo#cU$Zy@p0~1Hk7!NERK?xqn96=c#5T_vsLQq7DXRMJ@-7=>`4K+;`h?y}v z+SfTnOg$q)!Cl1MHVU31=FU*?9x*pX!8u~@zZ4XLLQn__K_TcihhIJ79uIhDAEe^~ zJw764X8OwsT;mmDtnzYlozy%@c{#an9;CdST;u~{?mh}0BIb@!&_~Qo{K1#Q^X&jHJzu6_#*f?lGgo+)`41*RlQB$MM ljI`vSlqoGD0)c>cz5qnq*URE-nsfjF002ovPDHLkV1gCd*k}L% literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_ethernet_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_ethernet_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2b31aa022b50c472d76313cc563fd59165c3f3ce GIT binary patch literal 649 zcmV;40(Sk0P)Sr}nB5Xle>sN52^K}pb&SptiE$CD%OYoq90sivM9ghm+!a}QS}0QkQzGIi zYj9D;3z0WT9c8FyR4o5U4X!ebi_Dj#No-IoonbdVG%+V~`$?!*EL-FxzI3o8vb#wj zrxsnoryh0Q+9{!hyjXG%-v&hfERDpYj!7|nh$?(bGa{ZbPHp_uVKH@r43)5%&*C}H zb$k#i|$%iN$5d*XK~PM?^?RE zj8Ti7y=z%Ii)QRvhR)K5o$gw5G+}UBU+-Ay&r%0QH}nS(3;p5l!7Rli5%trsx$9N6 z8NkU}UKgW&a~_K>7K#}oq;a%`FUwKiIEYo2>E(=1)Z@W^3cO_-F1GWIdG_MTA=cw+ j16fK6f*=TjAPD{eel3q+yiOxm00000NkvXXu0mjfa~mbt literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f7990080d1d7d7e30b1844c18be8928128af147c GIT binary patch literal 669 zcmV;O0%HA%P)Ri)#A+rN#ZV}M#KrnQ=uoUdx&}e)B(84V)X*Zhb`j|=Sg}(VanQLY z)jde5NeBw@b}N@>BJX?O$-+X_Zyy1Q~JX9W8v!)}~bi|sDSkn<}I$}*ntm%j~ z9kHe(+;B;meM-zT*nOQ~j#(ySLPw>+CRr0gDs@&#*-{ct8MUTVV>WrE=cE~@z!sG@ zN-c^>D`}?Kp%s)$S}DjF2Y0^GOt&A`B27f)iji)gA9<>X$_XjF_`tB|ftCv>t>D2c zYFva=>dYif^r{>pGMfkzQt3Vx5tVf!(nkXct#m(!=r=AyBtEK=GClZ^L+_;}B5|xL zzT(TSYC9qVSwtm|FVm{+mI0huPzAs6=LzSkaSmrbtML+Xu&o+5aOQ^^e@7hXZ@z~! zzt#9_;$T8Gp5aVQjlU!g`c-2UXKvN_Q{tdkHD2S)4f-04gC6v4WI#|=enhvb-FnQ!32goiP%3qR|00000NkvXXu0mjf DBY7@j literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_cloud_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9ac14e86abc55b3a73bfbffcf3b41ce39d6e3d24 GIT binary patch literal 669 zcmV;O0%HA%P)Q*c* zRk~16D1j)-;3G0Fbz$j3%BU$$Mv^d@pX)FtCX=~$?t%09{sZ^CIQJNuEX%Si%d#xX zvOS(N?UII@+PYROxanITnf9!^RoFw`@Qtq6psqQum{2)Kd}dW_vaU}ZRvFJ|hynWA zQ$}vWCt@32Hg1F_-4@&IFDHz|ZXbvtb-^wryVsl;V%P0aqWyjrLvG&v<;{Lm6wvqO ztio<{qM&B&RJadCfz2q`q$s!-6zD;>MZvWkP?&3?gf1z_VNp^~7^(@AF1T(%l+;&- zWWU$_Aj;2^!H#=rRV34K{k)Xk_URi! z602~{4(mGV@5+Dvoi_A{`ATn|9sbvtH!FFy-E!Qf)t%F+)U`EZuPxf=w1!><{&~)- z8`uFSyz6tnXjv}tvDngd#gs#8`ea#_Wm%SGS(g0^=!6Fvz=&YN00000NkvXXu0mjf DFWy5_ literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_extension_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_extension_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..73067affc17815b65a467383b9efe8901d6e4387 GIT binary patch literal 605 zcmV-j0;2tiP)s+&T!FoAXclKOyJydx861+H(HIIX5#Ex|}d#%$O0cc}9f=vcWC#*S_3&%XC@NXQCqPP5cckTVIpA*wOtbd$EbBo z1l*vuY9b(8;(#?10oSPQnFu&S?Td+kO_Z95fsH7m^v*;;2c;dv!1hskV&ZD|f)Xk_ z20nj82bCsoBmdgE=7>$o6!4Jd-Bwv+FVYWAwcm(=c|g2*K)%2M9`KPKZCZ+(s)2x0 zYBRm5s)=GLUByk+OhC#b#ZA>vK$l6jEeD)Z#F^cI8bz#F4fsS+7d8WW6t!#fAD-HC zx~Zn94Us96C{HtlW!I7>%@j#YJA!vJv9HIXb4iiTj0Ku8>14k7Cvu8* zEIE#4(z|1wPE6_Iw|_-mp%Duz_>A?!G zQ3E2$Gzm;dFe9Q5U{H@put*)I)UhNo^kB$2YzBgFa2A5m9Gjet0rm3kT!m>@i!4jj zQ=oEYMc{|A;SrH(mIMXxcv%E}l^8bYoo)<|y!DHKpHhK2;=3j=9wblQBG@tw*wo01 z$a)2NIFk*rFSKD>JE=h4zc_;&)$)_L6TO7tI+6KDjwJ_Wd@O#q0zwTH{2Bd;xG0>ta9ZDy9Yedhi0^Zut>PM!tZ< zqfd#7-s7;`zQ}GMDmRO2zU9bVA0@WvAPN_<9jN7Z zPAQg$xn|bH-g6OIxS!}Br;{v*D()mJ9;0IN>-dBv&XlO&IkJ{uI?|t%kBjUdP(luB zSrkF8Aq+Q)%-?e~Ickllt#ZEn8FLzWxH5vq*72;0z2{Q$^iasH#VS4*8Sf=;FAlH{ab;?9Jg@dus zS3Fj^r{zaz$Fn8&d}%W(?;Egx`}y_xAGvkbzxP>-ufMV)F!@|n?Z&wHHP^*oe?5wo z*(xr#vgi7N3?sowUJv(kS~`R% zow7(}bPUo|SvZet(WVAxsUOmwD<|~i{SA0Jjcv|H-KHfW9;dh#88sV!vHwuMW4TLc z?n;3NEp{$XwQCG|SA2Qc5^DNw7L%QZ&`RIc7LN4~*FWgi-TG35eT$OT-5-m@12Ywk z4`)4*|DpUKDpy*`xI61f|BsaL+}Y~JzxMp#wVN4q``d{#ol-yL=JTw|J)YuLzqh8z z|JK!Q+(w^QxJ~=ux%t*NhqQlz%FH!E0k`L!Jj4B~TyB2LueVLV?H8)me44mVe)oTY z?GGoLeV0%ADLma@Wb+3-&*@0 zm+`E+S*O?kbK^c8_wV_OIqO#k&$L$k;39r3-p+pV|bchu(99KY6clnh~I|v&r15vZHo?-24CqcCN)9K3XN}A}1OT zxve=QtUaZ}y=d`*_!BEbW-dFCt&-2h$|v|pc%!R+qu7c0hwMJNt-G1p<#;P|S;Lb+ z#T4F?6J#_FaD2ZeYGtu$oq&;BN;IQX6N%zUvB3!n~xic v+kD7bYbW*k>&7^F?8L|D{cgQd|C!2ftO$D&n7s#>i5NUx{an^LB{Ts5h>e~y literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 9c41590db..26cedd362 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -63,7 +63,7 @@ fab:fab_icon="@drawable/ic_qrcode_white_24dp" fab:fab_colorNormal="?attr/colorPrimary" fab:fab_colorPressed="?attr/colorPrimaryDark" - fab:fab_title="Scan QR Code" + fab:fab_title="@string/key_list_fab_qr_code" fab:fab_size="mini" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 6fddd527f..09211d9e5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -45,13 +45,17 @@ "Linked System Contact" "Should you trust this key?" Proof verification - "Proofs from the cloud" + "Proofs from the Internet" "Subkeys" - "Cloud search" - "Password/PIN Handling" - "Proxy Settings" + "Key Search" + "Keyserver, keybase.io" + "Passwords and PINs" + "Handling, user interface, remember time" + "Network Anonymity" + "Tor, Proxy Settings" "Interface" - "Sync Settings" + "Synchronization" + "Automatic key updates, contact linking" "Experimental Features" "Confirm" "Actions" @@ -156,7 +160,7 @@ "Name" "Comment" "Email" - "Synchronize with the cloud" + "Synchronize with the Internet" "Fingerprint" "Set expiry date" "Keyservers" @@ -180,8 +184,8 @@ "Automatically update keys" "Keys older than a week are updated from the preferred keyserver" "Keys not automatically updated" - "Sync Contacts with Keys" - "Keys linked to contacts with matching emails, happens completely offline" + "Link keys to contacts" + "Link keys to contacts based on names and email addresses. This happens completely offline on your device." "New keys will not be linked to contacts" "Automatically update keys" @@ -483,7 +487,7 @@ "Keyserver" - "Search Cloud" + "Key Search" "File/Clipboard" "QR Code/NFC" "Import selected keys" @@ -641,6 +645,9 @@ "No keys found!" "Show all keys" "Show certified keys only" + "Scan QR Code" + "Key Search" + "Import from File" "Edit key" @@ -672,7 +679,7 @@ "This key has been revoked by its owner. You should not trust it." "This key has expired. You should not trust it." "It may be OK to use this to decrypt an old message dating from the time when this key was valid." - "No proof from the cloud on this key’s trustworthiness." + "No proof from the Internet on this key’s trustworthiness." "Start search" "Keybase.io offers “proofs” which assert that the owner of this key: " "Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to confirming them." @@ -736,7 +743,7 @@ "Cannot move key to smart card (either stripped or 'divert-to-card')!" - "Synchronize with the cloud" + "Synchronize with the Internet" "This field is required" "Passwords do not match" "You entered the following identity:" @@ -776,7 +783,7 @@ "Keyserver verified!" "Keyserver added without verification." "Invalid URL!" - "Failed to connect to keyserver. Please check the URL and your internet connection." + "Failed to connect to keyserver. Please check the URL and your Internet connection." "%s deleted" "Cannot delete last keyserver. At least one is required!" @@ -911,7 +918,7 @@ "Processing secret subkeys" "Error encoding keyring" "Merging imported data into existing public keyring" - "Merging imported data into existing public keyring" + "Merging imported data into existing secret keyring" "Merging in self-certificates data from public keyring" "Generating public keyring from secret keyring" "Subkey %s unavailable in secret key" @@ -1298,7 +1305,7 @@ "Database error!" "Input/output error!" "Error preprocessing key data!" - "Error uploading key to server! Please check your internet connection" + "Error uploading key to server! Please check your Internet connection" "Export operation successful" "Upload to keyserver successful" @@ -1368,7 +1375,7 @@ "Password" - "Sync From Cloud requires Orbot" + "Sync From Servers requires Orbot" "Tap to start orbot" "Start Orbot" "Direct" diff --git a/OpenKeychain/src/main/res/xml/experimental_preferences.xml b/OpenKeychain/src/main/res/xml/experimental_preferences.xml index dbf19bddb..eb88e3ed9 100644 --- a/OpenKeychain/src/main/res/xml/experimental_preferences.xml +++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml @@ -17,4 +17,13 @@ android:persistent="false" android:summary="@string/label_experimental_settings_linked_identities_summary" android:title="@string/label_experimental_settings_linked_identities_title" /> + + + diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index 4c40b9d1f..0c171467b 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -1,20 +1,29 @@ - - + +