From 903818d68f3475a9d7ba5d5c906d9a246398b3eb Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 7 Jul 2014 18:36:45 +0000 Subject: [PATCH] Added patch from Henry: - Added translation for password input - Fixed utf8 issue in ProfileManager git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7443 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/authgpg.cc | 2 +- retroshare-gui/src/gui/notifyqt.cpp | 2 +- .../src/gui/profile/ProfileManager.cpp | 2 +- retroshare-gui/src/lang/retroshare_de.qm | Bin 541032 -> 541189 bytes retroshare-gui/src/lang/retroshare_de.ts | 4 ++++ retroshare-nogui/src/notifytxt.cc | 3 ++- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc index e1594d391..9a93e48cf 100644 --- a/libretroshare/src/pqi/authgpg.cc +++ b/libretroshare/src/pqi/authgpg.cc @@ -93,7 +93,7 @@ std::string pgp_pwd_callback(void * /*hook*/, const char *uid_hint, const char * fprintf(stderr, "pgp_pwd_callback() called.\n"); #endif std::string password; - RsServer::notify()->askForPassword(std::string("Please enter your PGP password for key:\n ")+uid_hint+" :", prev_was_bad, password) ; + RsServer::notify()->askForPassword(uid_hint, prev_was_bad, password) ; return password ; } diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index 7801780f1..7f5e7d926 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -254,7 +254,7 @@ bool NotifyQt::askForPassword(const std::string& key_details, bool prev_is_bad, QInputDialog dialog; dialog.setWindowTitle(tr("PGP key passphrase")); - dialog.setLabelText((prev_is_bad?tr("Wrong password !") + "\n\n" : QString()) + QString::fromUtf8(key_details.c_str())); + dialog.setLabelText((prev_is_bad ? QString("%1\n\n").arg(tr("Wrong password !")) : QString()) + QString("%1:\n %2").arg(tr("Please enter your PGP password for key"), QString::fromUtf8(key_details.c_str()))); dialog.setTextEchoMode(QLineEdit::Password); dialog.setWindowIcon(QIcon(":/images/rstray3.png")); dialog.setModal(true); diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp index dfa956d2e..c60715caf 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.cpp +++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp @@ -166,7 +166,7 @@ void ProfileManager::importIdentity() RsInit::GetPGPLoginDetails(gpg_id, name, email); std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl; - QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id)+"\n\n"+tr("You can use it now to create a new location.")) ; + QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromUtf8(name.c_str())+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id)+"\n\n"+tr("You can use it now to create a new location.")) ; } fillIdentities(); diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index 93dde5de256dd532d2726803ce8d7024a24154ba..0df9084887b5439d67256122519699c70bf9825a 100644 GIT binary patch delta 11120 zcmXY%c|c9;*T>g>&ffbu^HEB-(5RD2r8EeIsFcc(BJ)rPnTKnrTop3&$egJ%L~+d_ zl%gVI8E+X9@ssObGTwNXecnHgPdmFkJi}Vw^-n|L~|Ez~yF%^mGx6gYa~|M0$NG%jB$l@qgRl9qwKOur~%8X=31Ad@=haK&x~B?plCF4tn zi;+kR>{)`$Opy;{2u^mDJ6kQ&+g6(azic~zk*h@BvlRIBUk{}OeswxfpN_0rrYAn* zShGy8{KEwJov9%H)rYz8{cQFCpD*BxWB`9E5XkIa$XXB&%#lb_TeD2w%n=vJIUeYx zg}~qBLEPCJ_*?eCe{3yLJd4-FW13aUYWQf|WmAE_w;F^@`Tz60flr$yiaD7qN^nT7 z0{-C$5REGF?K=QBG*coya3A=Z1$d);;2ZQn4|2#YAZx(aMDn*%4QyH`Q9QfWz}w>` z()8`XzwHS8aU+TJG|tE0IRL%ze!mzv(m?iIh;e)){VdjA0sfO0@Vd8(k%vlTqBY84F_QiPQaS~ zSU5FH{t3dw1Na`v66w0xAWSX>A?2h*x;_SkDaQd!1rTPY11wn~QTFYfMA~n|=Y$*jW?t#C+ANZPiAnf=x zu+FTB`fz#7MefEmvk`K=?YTG%6#|I&A4sH`E(YeD2Vs9lprnH3;Az+KN{5C5|K0;R z8ic*~K{%WZ!n95XE*Q!h<$B|n41|+MfDXis{fi~TnZ3d)q!fgbBf!1Q0ipH+fd0Ki zAsxr!x^IpOTeR_;8cRMMc1=xfAGXZz*3y2RIBvMPt zGF3t3!6;U*iYB>U%uj8`Jz!Dl?lGAV>Yahn`iy~1=@NObRT70gNf0^(qiAtI2%U$a zIeZ0#UOfQxh#o>8j=|$|(03We3bQ5%^Z5^C_9+sD<~r7>HuG(Su;+_`cD)Q?b?bn3 z;~|`21o$IeqU_r|iTuaq5~)R$fmuz=Pcw}>!}2s{=C@!# zfI1&xH5&cclyn%BvI0aUMxbAOrh`G(aqvTHA!=wW@E6`eRP1!%oR2`%q{|@O(?Qf9 zeL<+d4^ew&;-s{OsGoRVRz5_p*aGC_D2QH_fw%EDaNS!Lr?paSg~9O)K>R$2t=764 zH;jP6o4x{B{tku|r-OLnHLKJHDchL9kZW6ko(X1cb*^3d&WEA#TX7bq!_dhmfbQI7 z;Ne*q9D4(`Rlv|B3~kSQ8TjQG3_Y+B7vMmargPv9usoe!`EnEt8;aZR&Qn&SGvhw6 zCY_t(dl>6=A7Ek{j2n~#qD4N$+GPV*@E63cYXX_Y-w@X!4(OE?EWCvecZj96@OE0! z1{O|Q1oUWYSTyuMT!CXDX@ETlvneDko&``g2^Qaf2Q)R3)wggkx(=(Cj0U*r18aY~ z0aTOC+8UYJG(yJocpQf3kU8cZ@RP2=PV=20w%H3i4`E`S|D8n{MI@_-!=LT$0@*eZ zj)$%RvCI`t+`Iv@wPkS1sSdb9hv8J`ERa1&fHN%@gScG|XPhw1_zZwE&MSZ$SP18g zltAO3!3EDI5PENg3&Sx&AO0$lo}3IMXK>FFOx)-EadJO@g}Mk0AC|!3*y{ zfd0{wr5U?%HSDBucP^7P8Ak-18N*pt`U2OnGiMbZi;o!1S&uXUx^W6;(=!!g>l)6c zZyk^sYR;xI0>sCjoL%}m%m+=JORF~^dah+@E&Jgmt6Tb$>>kY2#Lea&7uH~j;lPax zpVA1VPa4-Rt^i=+Gp@gBHLlcf7H6U-8e_KF!~q}Uq)D{x>o#1x&tQPJ+qn2Cqd~kJ z!^OYO1^83OP1$=4s633hn3{1{S)i$v%^NN`at%O!0hi+S41hLsDT_M+Eo$J>Zp{Mm zx}2q%TABaFt3O{h7uW;u(e*~G!CW#`rvZz-6%E#7Rg&i)U@>-VJ z%F;r)lB=9_6v)dST;(dviw7(u(#0IBZlzc5S;kc*;->n%gb8N;$z3A3R~;;Y`w}RT zIQQn>w8YoAn8h_JFa};s=HBaPgDhgWL^1mo_dWx&ux32>{$wSPHn?f7tAO7;g8OP# z3)Ie$`?f6wgvToke7ckS-Vs$$k`wox;f!^1=bD#v0&;r4#MU(X9|G14xR^BLao}W5 z62%ivti~)zY15GyeQgJ#Ib$xrnQ@y~;BQvupNaFrG~l=A5tmE2F`es3C%1t>_a(B# z-`s2pNN4|89HkBtg`by67u!-G#!aNlYRqpB-C5;tKIX-wS6wWKtqVx+1)cycA|%p+ zm#nS16?cXCnJ1Cb4Xn`I(l$&aqaWpi%;ye?t#AcyNfjCYhb8Jve=;Ezqw^&f)@+WE zluYwMrTs=E(|e`h8-_}x*&~^Yg+ICF$Pz62ao1U)g+uatlF_pl(BdqTvE>Cyh;d}= zAT4lLLdf~fiD_P{(OUZuX-do z(E%UCc{(|@A_ur9))M*RW8~Bx26X0Za{66s5IR05XKdp^rcab8{Fue^T3dz|c#@0J zxWk>>kxP9r0=Za7B+D%g%qb$5&PL(lSVAt{!^P1dm=xuIMY*(|6yL(4mGi z{l_1G?kFTRzU_ddP9-&4PXOO>EqU6l8ffWR^85%7@aj+UVpA^A4uLGMjh@KUSaq9d zvNx5vw6!E@f3WbjuF3@|GMDSUK=^9~OKa=n{z&FA?;CI<$ICpPL;?9QU!wTZT-K@K zJ&4`f$-Lz~a0R-`yqN>gTdu6JZLp$T7W^d!=x_fpKTB`r&rz~LCK!?4oo9)b{vIco zZ16`PpnFxaVe&wrnWJRG8%_gVzDqXR1#6AQd|7M<3|NQW$l@;V0h(UT8Z9kJQ46NA z(ks6@%NC8tu{ger`B|B{=gCr%F(p~Gm8Djc11)PQOFL!)vNm&N%cDAA6{(f2yp5@% ztyp_K!-kJVebdN^Clj%|JiLZOT7c-12iI}5b#r}!$X{44{SH-KeYM~Ai;={v zVsLj^{q43uZXJ@yYfKEZw3fY$7!C9sGqAFatU>+|gri=vh8Ampy1!?BHkQV9Ub46O zX#idyWsSC;KwD2|2{!sJnX_d7Ovl#_EtP$sST=25Ap1~k3UtE&*@xOl3_@>YpW=Ff ztmd`sbKt)q3~rK0L(N#Fjb6#OmwnsTAL#zEtl7rj&<)*WN8*rMJ+hJP1Gm%#n8H4EK!V+v<$sw#kZRc@Mn5mtcZw(*dJQd*KH$Ei! zD2OLp@u6)Cfa9Y1&@|k56}EinI&%;iu*71a9FL z`K?nkfLhiWc&d)&*;|q_kyYAT+Uh#;S+4$A0N&xVgNlLAZ7or(ijzp!CNPaY+58os zH+>Co=M(t+(;>jQnea#22BMZ9&vNvx7FQJf@u|ImRC`P0t#(COu zjNm9Icb7<)2J&S+e6hN@E>U*>rbK$)kuS?d?YlIMFZU(DznRaM|Ejlb()seC4&W>d z8OfJl%LOj*1b^-2V=UNy=dYJ8z<6cNSB|bmS$>MYIT}|={xx>eVS>$b{^rEqAl9zt zZ|=kC%pJqu>QW5E7c#&0{>sa9_xdZ(j<`6ud@0MD=S&u-)c=T*f&-*y|stVR6G z{^cNU6%Bmbimi5ZvuWaAPniYewOk@K+G}9;IsQ!~MxOQMtj5vG=pp~_zqqd*`$-f( z{$Ls>E5#=MCyGsa!j5@41>-VGbn@XU*-0lW^J2lQPaNXQh z*%QW0J4BQEbu6KSm3x6Ou688I9P5R+j`)UMHwbY7n1F0Ogz+n|zU|g5OgMn?@Tp#y z@bDu_r+8M_!BV;2N|@9x4QRhcR^K7oqG^RNKSYCeMw+nTwkODlxv-$|1m>I7EXu{r ze7BHfjbndfvasaFeBk%!h1A4b7)@TYOc%ZJWR7ZjdXyr)fNts|th&AtXvJH$+SQ87 zVtK9(+&fn7s#liI61KeD3*xcIOmK7Ua<8?pefbvri!uW*rwTg;UjkWmt*~Q9F=hy3 ziQ<I>jI3=$5lGX?nGQaH2`oreb&66v)E!eJQ}Tle+}hkLw0 zUol^zc*9i47qfsQt`_p2p^l^N*qn|I?z@HK0SAGsE08E|9VMKIk^yuf68Y^NBnm&< z2&cNXM297oRdzHRb4WO|>O6q?cZu}k456T6G;qFhp|JclkjOQ{g&vsl;=P57U9hG) z5+Ga*O9JuHM&ZhV9H58V3s;SI0Zm*al&NBXti3OkWqknNr&cJxf0m>6~&bN2LsV)!vv5dU{rjL>bs z8HtuC(-1LYSqerA@_~)6D#=I7;>qP0>^0sQxH%Uk?{Y z)qFrX)P?1F`uNs}Q;eqrd7mjxX?X#-+UFAa;+f)hBlgvJKln+%ZR7zTF0ZyDz4%#K?^~W%T-S8AQbpHrKFMo+D5%c}8Ux+m)n4kBAo`=K(;hO=*2Z#q2W@FXeTgmBig#umsVV~HY{WS}a6)q8h0-y&X~-~;?qU$G?i2S%J7 zV%fIYDCMJ>pO1d*U9EV%@J|qSP8V;4ZU(;YjCkV(T7tjr5r5?f(I{BFJs(SpEt|zV zX(xf4FA%E=t3hl@avm5sh8`0U!{WTRTQ-JT>M5$XRfGdkB z9heVdz;!Aw*$dRT1yy;4f_OHBs=6G-^}2=Sbavp*vC7Vt};vbPoS;hQ_#H{ z%}jmuO1Tkjb#oj(TQUpubtTuwvN^tPig(oe*DsCBS)MQE9O}n)1ycVP^}nM+oAD~E z@%5fmuBQVI>p(DVri1d6&<1-$2RF6@n%0WO+(-lN*)=+>-5iv=yXo+|J|H|FNk;|? znBex(vER0#ExMGBTd)zt_SuTxI6ht>-9;7UkZnVZU(Xl1nIBh)^!jEaj ztvNvApVEv57j(u7B#PDcY<1Vc++9}R)rULF+II5}O_bAuj%C2TX+;Z`4*`0)qk$Eh zXi@BC;D*elMdOhUhb2#xDDD$0^>Z-VC6{aRaXcQ%b^q&xv7m}I z`?->@Da^&+l}rj@Bm4&|zRP=SaPv5|W`+KGaxjL~`|liTu|__%8Rx@eqA;0RY2rT26pWvU)dh_f7NT|*Tc$YyL@ea zI`CT~{3K0`7fz?#&ROzR~jB+IZwaCiLtcvrm3H8}ISYMfvHY*ot@;B0n?! zGd}M`19uOSpLGfWIQB?>ws|X%Q%@v{JGvTJxnCmHOqCa|Dgz#NNTkK@S!Pc+^C$9( zPuO&NSb@9?{CYq6^<^l~lZLSRo)g>)7zo#$VpyzRVX@R zB3}~3?0dNxeNkv;+`s@hT%xEt%i?-1_vOMT5fj^-d59oE7bEpr}^NWre+h z-ES*=vM>zZbdgBSKPr58tpPIDNzvs3D*uB~imqd4pnY1R=(-t4?%X!!)jP~36^D5~2S z=B$}iiwm;i8dzG8H^B<6FvyZDw_`Oyt{y4F6e~_+XjLpT@JV;YhMbK+8XqV& z?s$XJVUJ>S3zSR8{Up-eXifz?;GT>Nw!(kYf`iSg6#Mu83;e-B5~(=TK;0cy9~?oH z?#!#tCa1I%#ia;ThA*~Dq(?3&F3tS_^zcu`rGL=pZt=TBdb^4>_0iiltXEvgnGWLH zcZw_3=toRyVc<0riNY&6^9uI~1S$DE>DDtB5J7innM{QKn=y zA$q5aW{MBLN9Q;R2fYG0Y`&JXw*-GD1g^ zT|HP+sH^e=}ITJdf+{qlrGFLwKkhNh z3-eEIsZ~zc{!52MDkskP7u~w^%J@DlfflS+PBGd8qV||XdgBEW=R^BeBE4yWM4^Fg ziC?5Q`zxmmdk7@^hH?tJfZ_xEJ0#6~temFmjx`ulLZn9G1)O@|Q!e9-91 z7@!XjMyt#M@$GzHsoL6B0$8}KEUU1;(e0{4kz7#OAJ0G$wO-}W731yY6)J~@U$K9` z%GnM*tIGSVd4PlBqN@AY#UR|TU@ik4Y!0YGI%c7WY*O`|i^brLy{fQf=mDhj2JUoY za|Sw?zf(mO*#ciaR~1z=7FmwO)$iuRP7aI?Sd*$speZPvd{uLlO#qc15`|PN)tqXy zdnZ!Wyp1UOEF)FF->t?LLoof=g2gJ%*=nPc9o%^AH7hud)p5XoR+Jy{!^ps zyUzRujZf}xuR8v>KhPZ`RHuTc;a-|7Q9ONAb^81}5NA(Oo$rM2vF*01NQn>jdaJ6q z6&h@$NmX2g2F*nWRY@NU5K>-96jd$;KI^V3J!c6*Sfr{fyadFGi>k8!`~dd-ttyXB z1@dC5>RPLrAQQhNGy5o4i>0=zJ3etB)}K_}Eg1=Pb+oD~Ckx$?B$g1RC*@;VMwA2h zh!sXz*_>6qS{4svV~pxm<3V&r&!`%h9q=DosNRjo#C^?&HAe-JJ!oP^`#W`YRQ;TU zXI;%w!&L0FJUyr8mg9;Ja#s__IRMX|sAY4ef>@3oShSf@g__?Mh<1USfot2d>S#Ab zwOW~pHF~%Y(+oD_b~F3I4qO=vAMBtwscxIt0(;w=St9<=IhHZFpV1e!&5 zULCyQBZ!U5SlbwHWtONOFc0riIfadgaj-e49vHm_zd5tpzvP2gru^X7)z(UVd`10vAUdDq@KMw2WbCN^;}R#b7QKo3#3xdExrNb)yd3$ z=o+V@dFm|%IM0iAskd>DKvaKGZyVDF^>vwg$A6Jnq+U?(?v0CWjWMek>Vv~|@b|O0 zxO^nikd@4Sn3Yk1I#lEO)TaxU@pV0a3hBg_vv{_T}?dES6`@p02hE9N>V?_4#2X`R$VjK8c4}nb?uuM zzy;{lPrBkuRdiL?zbFCPc8vN>H&mU|@3Ye3uC{lEsy}!sfd8{n-K@e5U2;SNnqQgh ziH5YpU1he4nT~KXZ`SaUwIEDgp%LWuz?Co52#%4s7q_qxBOHv%HD--XzckiVxYRRMl-Zy6Tpo>BnoMFB#QN8Sj|XRvNfJ*M!Axw ze#{S1Jb@*Q3RVXp*gnnHF{Nm($t2R-@tUpMF?}yJ)@;|s;kN{8H9PAt71_x(+17Kh|M5|? z-`XCl-{+cKBP>UEb=MsB9*9$;)*Mc`4CA;x>6-kVxYM&XXintJ2KeVsO%W^r;g8i4 z#lOlmMU}5mYz)wpY%RqeyPc+_tQ$bxD2ZhDF^RI!3W?&0C7P?bn1KqyG-bATu`aG- z!Wi%5tvb!a3|9<9vow$7`5^x2qp3N45yax(HT9_hs2_Ejmo40ISM=5V@312XbIdev zw-jJs%T}WB1CO&6AVRw4Z4Nqs&zEW%=VRd8T%q~f^#_*cewu$K4#LMaQ2c8S9?u40 z(sfN!dw*cZ#yFDOty#?&A1;TPj&(zKH*l=Ka&aH6<5pXsYfrJ&WA$A+cGG$$qs;C- zM(cSC8w=lNXuTA@fGnD;_0iy(;-_kTCT8Qea)xOAY_OsKbC%YBB<6(@Icpq?^>wN? z_&w@}7C%|raX#+*v=Q~SKyw|m1N#P|&#Ki9%tm8Aqf8swh6Ayn0(lo}==0h^^cmKB zds*7JXwun=)r`}VRx6nhJ1_aXcEcb40=MsPEpvQ{YRzA}i%&xT#zMR6c_4_}EVa7_ zqNa8KqTSo|GeFQ8?cSdS*p4aEW?h>FbVgTgc3mQHsdu$Gd0#=i`=55-z_B2>ZPK33 zMa8_^Tzh71OKgkG)fO~=L4|Wvd)_hv1mAzPg)`m(Vc%n0kW<5%CQcvV-cEZr$rt#G z4%(`~2;g$>YpY{0lb%b~KD7A=)Z)Ij<`9M=|9EX}HcEh~=h}wHFR%h@seP><3ZhLi zn-ixetsPlroGa>2?a#iu@yTavf4)F%KsV_G4;jeJs7`t6A-Z^#=1bRDjmVmzFybJ@2O*UMp@OX+Tq!8Vks0mPb_ePgX3e}gk1GLJ~?LLDMU%yGW=R5}IxO);s_Y(#_ zOJXD9eH2-`{f*eLyFZU*##<6HgcZiS+TKjpo#3|tiC?cfadR}pWmFD!?jJ(OZQ>G%G@Q^uv%ejB#bI*0|x%-^G_jj%DS~nrywsxuQ#wKz10H7uCI~yU}g7h#G z*%kO-7mxwK&v27TikHcxCw?FI09t+s849$bF>)X>5BVq1JN*Fo0HC)%0|>o=7HmQO z0BP3{ne;*`fM|`!OJvf33;02?FYqU9kPO7Di;>$v)D_931vn7#I1c2Xk^6VcB*n&K zdLn#Ng}+mAIllWI=n4F^WQu41GIIZSnWWfwOivtQew?|1mayAxC z@aQ7Y-93?SL3&gzlV1IgrExaC_`mk}4Y$1k987`sk2CT%-k8Hue1ATGyAEI>K2W5z z!c-<{^pe$cK5<_7)Y5^fUm`1jpQkqR)Za2m$w`@X&n|$T&cJ_cDO23~S|&A5FtY4F zWCW0sXGnZnB{;^O<-kvCgM12f&vk&{Xb}Hv574U|q@Tk8dgFQQ5Z{7-yqlHs)~06{ z0Q4&cKJF1f|NTI6QdtAjZ;c`BD&9YzHuLl_`1_g1GAUpj05PTLsj6JF5^3 zymuLE5DcotaUkx92l7uga}oR4YCt?90o{x9c`6Y2S>2FTK=wbDNtZ2WX`*>+5ybzA zKrcK8@wx~k?I?&h96eBaLL=rHIzy@@rD%4&o;-5Pdg*`1v9bmoXrI zcL1T6Ad_|&#}<*TzI{RJ=>>GX4@kW~g7hR1q(Onejo&YmU!H8_$MrI4$Z3$q-~_Cn z$U>=kTr^0N4&Z&n$)p<|f%IoSNXuHtq#FxBnw$+_CV@0#6~NNfGKFt%WYVyIjNJGQ zq&bPed5Fk#fE`ys`s*@CPyYjHEl$)KybhA)ECgxmN8s1Ef|OhcVA{n*ej!%Q#i{xI zV7IV(>ccf-E($kp5*wi~*qyln(ryXJ-EJ~zD&7$u(+o$D_O}Jfd$9~W?J8dS&`=QH zc_2rFv?lEuzM{r)ua(iP^Qvw?=>kN>p&I1_U z$&^;Pfb@I~Ky$nZlJ?tc1@pnsDjd~D&a2NB_m~-7&xTbT20z$l#P_0iJS-(oA=(Sd+wCg2=Odbf3-v>hG zqBQrehmb1=fF9WdA@|1s4K+Zo6{r>F_0Zer2M7+!WJ(QTtWIO@I|O<^T@19NEA)Q0 z5jhn?c~pQUt7Hn_=E@X5u9QhFE*iOaH1pF=XRh325JgMs6I;B6T)O5e7%i2lD9xTc>k1 zeNhC1w|oVD0LX7RKw7yZMgpafuVn%0J=kE zIFXTi`|l(whcjQnyOh8{@7HF}OE=pDJnEK6@t)s(=np}6gC^p`%53z5!|Knv?xXd@r4DNAVN?X+qI zEQnqR^yqR}IP?czuoPnZIe;{aLhRz107cQT`0g8^%g(c!Mvf*vux{ySfa^Z6p;;MF zt)5w#nA;A4q-jw=K8Hfum^UCsUxghOJAnM5g&l`5FwdL7!cD^B)K}n`{cYe=CP8+{ zdLUP}!HMf-AZ#dtQ%=u-J9HRMwciWEy%;#%crlQanQ+<(WyYr;oNlukxc=whe;UbZC%gV_Id{V zbPZ=)8V2OSPOjyuHy95_b1qF^0crP*B{c4Xm#k>)&+k3N%$m5_cIA54TH_{7;X)_Z z0pBx$>l2v^u;2;T*Q^3p>S-3)#K3D7v2{%xaTq6?46>_T!A1ED26&yqMNJ+JB)@=* zdWl)rF@c-B=QvQB!(7bFIS&?SW@8)9#SK^wa3q&o=Jf=CHgL-pw*#6tfJ?YB6Ufz> zEWymiq6fEDdmTeTCb#bUeGr5SZnMLApp*Brb7qdV9k_i5F+F-0!0n$@0Nl9g+`)2; zxAv#GOs^=QrVp9a)Y~%a2X{vL38cuKJKO#v2rgS>O24+T@TUH%2Wz;Jmbi$DgIQWr zYfI%Pt~B~@;GcKlO4njsJYXr4#!Y4wO%1AD@450txT!wXG0EIN&i6d`!r2?d<+X3lXeu$hg;Sia4I1Q54p@h%r}W43w5w{z={k*Ag| zYUXBZ&$ss2ru55|?_gI5ylFk(VI9V|d#S9nnU94F-|g9WAkFRh?(;nX8imQE zx&4@xg$?J<{48Smf(CZZ!rHFabbj=MBOv(P;>VY`0=KlBpRmLl^UQ<%#CTNa3(2g( z0+p1X>H`3;2tTdcGQ7hOnRIV4bFuX2uP3q?%RZbBJ7?(_H;hl}+6`#Fj!#Oi2I5@C zZyTrs?s71{eex8Ly1wI6KhFYUF`3`7iUF)Fl*w=Z#qS){1kaz!?-4OoUHgjP`}_g$ zeIxnw*m!^@sWR!=eSAj1Jm9*V<-oeG;+=I_M@)gsiO?>_h0RD9e zUl6t$sLfYq_J?b<_9kB@I)UJ~Mke9k@YfBP)y{9n-&SM;Id`3}IOBjz<^_K@rZteA zX-0lH!r%Sp1JKk~e5J2F@bOdl%55h=Y`cMf+^GTu+kt<2R0Mc&jIZ93i81bPmi32$ zr|($BAA|VaZ<&jgH6Q<)g<83)=DiVIu5|MYGc+C9<+{g)n$D?rIKg^R! zYT|`y5I`jCU`SPpx3vtI;$Q^Poc+`2%yb|Ge2u@)z1=PU=viNH;!zP zwZBL9Phs#!AM`YHgkg$69Ce8>yfz2uN|i9$1wBdK5n;SD3f7@lLgc00Kv#8Pb=LSm z7ci}jLG@*euy6uCi{tN^pN+YDGhtaAh9v8iLVQUv&?~V*!to{`{4qyZ8SacOQYWmr ziJ_ukg0Nv>D3B)}EWyTA)$wm(N8osnE+1#-Y#ccgR%7Gp;j~6LzV!`AXOo5O@&`Z^ z{e+zL=<*(XkSR88F64&dMm4mSNnU5Nz!rU!eLV1^kUeGDU3@BduEq&%;IoJ@eDZYb%6W#eI;D?hM# zqjky?6=t)5>z5-cTD}4C)+AA#X9~nSnZ?+-@|oyC?dEbJ%&euGZ%;9x%@lz9-^Ad! zzcF)JB8FJy0>=#!LlSV~mDq_P8!dpGoGJF!oB;m)9hv0m4YsJIxdj#bbgco2b2PH$ zXR$AL9!Pgvmen%MDffanH5qNLBEra~G2+yW9l$MEBhFY{4s@wboKsZ-NV7gk~4gCoq!!KZbIm>hf-h~C=B)1zh5*at?QT5V*(E4IkN+Em&t zZkv*XYb(siQ(-L2!J5A^os~LR+v&E8dtLp}0NxVQgYrSlY%Y`Bz9EyYzsIzOIE(&b z*0lA&osAKX4u3e1*46(I!>Qi9tQMdWh8-tmFPI z7xVjV1I~H5m_H4tF@J-2$-Drw%>bN%7NRPDi%022I4kcESQJ6S7x19 z#N$(r>nxKd{4ExB@kMuYO{Q@7x=i}NM6oCnbKit_VzDm|;;VUL@o&G~;-gqR)DhZ9 zLq>|lS2KYNJRx3vj@D|>U*fgG`KVWG#M03fAUK>7uaCx+a>SdRbew1#Dqf$|9Z2OD z@%lcT&V$#)8y)h2Z}LvO(Ki_#@pI&-G+&9PguRJ`{C zlh+oWM(#}#@6QMaZd#1^ATI-?1^by_YlG9#eDRT{F~HNS;*+u?zpn8c z$0(+CvQcv4FHAOR_Il>!)B~5%A}1fNJv-@SW8os1_lyLwNsZJjM+cL7I2~_3+Uq zY2y8lK#R)RIcICt#??}^eFD%vLs*UTAj^;S(!5|TmNOEh`8Pd5;4P&2btf?1d|}}( zZWd}Owgo=>vOlGzW%EGXZII#@-2l3OAWL&Gm`2Z$R`x&@t&BFr3eV?SXSTuN-#<3VTHxreV(Rd)*wYkzh#Xul!tyz|vE3Y`nD&72t?p!5h zuDOKUR3~NTW5%!a5q6Fz1mGWETGxCV!&}ey)&C zb!-gMxh124^HoUaieCahV7+v{3x>QXZ|On@^i)T( zqzk=cv1;&3x_lr5XeN`cnC=9+@P$;QjsSkcU8!jA2M~R#q~gmcvb*20K=&ZNLor+D z?#4A?=iF_$VXV^K(IiUx?|}qReM+j=P64`YIy3Wdb!vZ6Y8Zz(%B=|LXYy?j9%T{! zFHfwzOq5A>mk|CYj^l7w7UN-19a}@1j_QEJxWv*t!uV#4)p_*b+?ZE8H%?%Y?Hp}I z((Q2*tmw=#a>_E&qm=}7$u$xzW}>L?U|H=PTU(LdH!)^U>rXK@Z8cf3IR(h}$7JPpTLA7ZS+xe0rN0$fv%nLi;8dB!tufh<`1^WRWYck! zu+p7mbLWpBb@P|0CiYY17o^gL`FT(5+LRm!-3l-vfE-wmj?UmH$+G5we{z!i?X(w2 zMmLhZcL4C)ZjlpOJK&>DWfFL4r0O24@$PIPkV_MNKz!^=3daA$l$VmC6qGfKJm%+P z7<+3TxpwXtNNN9&vXHGHK08gys<9;4Y&ZEGBS@p;@FTm=wE zfmGbF1~?c)9xk;ede6@?uK+9|02JLlp&kfSN3z zYOfF=xhJT)!{4}G1(wm?ku$K;_SXF6g{-cuBzyR zbnW%6Xvg);ucNic$73`R;~?F9k|wsmFwwR#O`N(3OBO*i>Bel}qaM?wS{JO0<;o=G z8`-*!gE@az)6s`>U{;;HLl(}YxowMpd)1WYt{j54al4Tv9L*bl3AiD1Xx;>*<6)Up zSWfe8lYn18PA2VSK?@?Vyw>CyOY7v#*Pme(o!o3g>0@lo@bQG!TsH%0{%Tr#tTXU0 zn#&}WG0efQGfr@%-zaVjEA(?TQ7IJKBS4pRSLpw32hzjNtijKf|MG^p_`C8^C)f!8 z!O97W?poYDt(UWN{s#U)0ju%fG1TI#VoC$fhkLPNdb|kytCfm5t+32_`-@_Jt1Psi z2E_t6fqDFV#R7gcb|=Ow7A(TWXY#KimR$n6;)Ei$susithZV~XQ=nkYJSFze+E%1tZBRjTJtZ9Y&zkDF`>tbU|6dR7L0&&{_#pc+NKek!*A;e`FCU`3jl1JG!1BNM~fxh@8~Z8sE|xws~LV-%T1 z*1*LQMdtNjpzZS%nN?BveiJ5j?HpmE$VtcV_|Hj^^Eb94-UKU7PxuV<&)Y`syr4Ma z6bx|uf#OWVHsDV^l1aAjGqTiFCe_?moLgH2BBaWs`NLRRS2v3gMad^ifcquL+aPZ8 zQ(Rkt3HqW-tfuQkcYDRNpmt~@vlO)+UqJ}Isi^IVwXCX#idxLENt+7AOAjpgCI=~A zjT{N|n363D7{y^XCcx3wLn+OP1!j>(9y9-g;mVFgdlGo9oo4dYktLgRvF~#vGlTXbq-3a;=Peonaa%>iNM$0QzoXq!qh>d+}a4! zrEEW$bQczrNOa7j+b|7{rKKE4qI|NB=vT=YggbFqe=C{HnJsDP$zS;}EM4aaEn0 zta6xWk4v{DbLnO7-cjZFYy|Lmt5i;IH6VJ{t6aXtV&~$z%GC>}scx~#^&no_siVqm ze>r|Cj?L~BWP0I^DsT_lmCS!tfoHJ(TQHZE_OkIEry4c602`V+RbxiA1#;6dEy-0r}lLx;LgP|Xcc zqR+8Z{q;9)!kb%E^J1KUpIfV1(8dgSL$#5?FI9`9iZIIWX7!=29kSM`);i&7e_5+G zUAP3oLt9nS=2##*qE%Z`F#c}TtG3?5e(vUus^kP6kWTMa+uz^{x@O5ngn3)W$EyyU z?SM;ur0Q@*FqR#2RfoSl#oVEmWrdk@U0Gq+NT&`PRp(oTpvGq!+47D|dgg-a{803B zpEjuSCX|8nVg?KC6Q)|3r7HBih!ZoKW%QZCyR2YleGR6T8&!`cp^5CAqIz^;54x58 zEVOSAY~LjHHK>-ZRDF75iHbLg74~)IeRi_?zCN6ax%B(pbQsak2Mb+E{R{!(Rke8_ z-kooMwUu2dfTg?Ix*Yo(ovz3vd~3Bsb`mC0Kh%yLQExA;Ry)?B_IEH+*M5x2_ z>_9A@qYkeei!4Us>UZ74PWB%ZuYTH0fXuwBKHCoOBc+o%PlW?}xlNtl6bo$pXmx%b z7HBRwstbBrVjH`UOrlCQ@^PlR@PF1I^&X%u3N65&P&lcJe)s|Gd#f%U6c2p$6!q1n zGe97pUonSpSIdNT>RUdMKx$g3Zx@UNx;9T;p0O9JBQIG@xPdP!Wl7x`ENyRSf<~VK@zGaJ4^zyBCq!v_Z2pKs z{hnDxc&qkI*Yul<-*W9P8xi4X+eFiU(0cT(Y9lKiA&;Q1_0aTh=mW&Clx0MC^W0lj z8DZ_TJ4Z9~CA!NQd74>UGcZwZtC{1A8oD=JGbf@PyFhBqocuB%m+vr#q3fM4KGh`W z;yf?hsY&4;0MU%oq>T9krMR6Y^~V4-spmDjy5nM7w}@2^^})w=@UJttxO`;No}ZY* zFdGwlO(sdl2=G>OC@~(WDvN~=i{&+GtYVnIW$I(i<$kw;3vaEtd?6NSR+OfA{dgeH z{$wu0ZEz!p4)^KWMpMCi0;zkhxd-QgKNPFEmmUD*;W|y_oEE?rY|vD_ss=8=pn230 zZ>o5orlz_8=pWZKuR3AYIW2${4tKS?S*ZEor3CRFgsnR}B90Aght*y+t03`33wkAFR-RFGm^G0q!cb(F{PR<4VVU$d%VX5|Yx)P*c zAGNPDu=4kGxwdW|3f@*P?OWHM$OGE{CJn^l8cF_n%(BLK^EZ~WnlV0HBW5+$4GX!U zWBpZe*}B%-?0{~tWl3WV9o+WoJmWB{Y0-=^!ll-+<|I7jEB#pNU1*ZE9J z#~x6Bo&QJ-0hea7`mt!G-|Bk2!&ISBG;2+Hh0$Ty*d*& z%|2cFvqiwg-_~VheFbuRqHbURu^_o^(dA@fa=bHMcX~r(?0`JcZ~2HovgUl1=i>dFJdfXlqAtBAk= zdghhxzU@cs`~>JK51|72mFud~G4h8$)z$t}jRq`M_tG#FNDFLQL>hR@M3xchifO0r zSFc@Iw|u1gRgEbD<@Az=0D?Kyt4`g=VqK_S^*g?uu4WC9u^z7F`j+j!fz+{|zU80T zaI8`5ov)Z-J@|>3U`43DSEdyPMEQ$v#bd=Tt8Mi!BrJnqVE#(6Ua+F zlP3C@4AzGj98i=S=|j%=W4nC}3!UiLI!He;4$Cw$JtjbZQ>TbdN1>uG#7t$l{LxVbme>fW;^^bRceNjS^2DCk~u~evnYd8 z#yb7Z`>Oz&X6SdF{w?dAe)m~a;K(~NiMx%Fk6*ILD4*6k{r)=a%H4UY-~SDjvG#{d zURQ5q_c;B5n1MjJORO-;)voNL{)CtUeAFiWiR+`W$YiTOm5crG+xPT267G(aoy;t{ zkFB%5-0l_dcW=oQTWmJ+Ubeoxe|I3QYgs~ckeg$w{!^JJ(8b~U&#Q6e|6!*8s_FyW zzjO6JMqy~J_)q^ce+P&!+M%7kGj-Xw=oR0hIsD`CPryGh=UcR7IeW#y#}fXLoP&?) H@G<`fuNopW diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 5ea1d4365..e7e3af248 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -10519,6 +10519,10 @@ Welche Ereignisse angezeigt werden sollen kannst du durch klicken auf <b>O Encrypted message Verschlüsselte Nachr. + + Please enter your PGP password for key + Bitte gib dein Passwort ein für Schlüssel + OnlineToaster diff --git a/retroshare-nogui/src/notifytxt.cc b/retroshare-nogui/src/notifytxt.cc index 2fa56596a..1ee651caa 100644 --- a/retroshare-nogui/src/notifytxt.cc +++ b/retroshare-nogui/src/notifytxt.cc @@ -103,7 +103,8 @@ bool NotifyTxt::askForPluginConfirmation(const std::string& plugin_file_name, co bool NotifyTxt::askForPassword(const std::string& question, bool prev_is_bad, std::string& password) { - char *passwd = getpass(question.c_str()) ; + std::string question1="Please enter your PGP password for key:\n " + question + " :"; + char *passwd = getpass(question1.c_str()) ; password = passwd; return !password.empty();