From a29a93f0c8f97f3ebe3c782a93779abfbd19fcd1 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 6 May 2021 20:57:15 +0200 Subject: [PATCH 01/12] Remove #if defined(LIBRESSL_VERSION_NUMBER) path The SSL_get_client_ciphers API has been available since LibreSSL 2.9.1 and is thus present in all supported versions (3.2.x and 3.3.x). In the upcoming LibreSSL 3.4.x release the SSL_CIPHER struct will become opaque hence the build will break. --- src/lib/net/SecureSocket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp index 5dc28301..d84f3461 100644 --- a/src/lib/net/SecureSocket.cpp +++ b/src/lib/net/SecureSocket.cpp @@ -829,7 +829,7 @@ SecureSocket::showSecureCipherInfo() showCipherStackDesc(sStack); } -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L // m_ssl->m_ssl->session->ciphers is not forward compatable, // In future release of OpenSSL, it's not visible, STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; From cad92e89d004bc915441b01dcab0b3b89564e80c Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 15 May 2021 23:59:25 +0800 Subject: [PATCH 02/12] Map more X11 clipboard MIME types to corresponding converters The following logs are extracted from pasting texts to Firefox's address bar and a Google Doc page in Firefox, respectively. [2021-05-16T00:03:14] DEBUG1: request for clipboard 342, target text/plain;charset=utf-8 (600) by 0x03000044 (property=GDK_SELECTION (511)) [2021-05-16T00:03:22] DEBUG1: request for clipboard 342, target application/x-moz-nativehtml (603) by 0x03000044 (property=GDK_SELECTION (511)) Inspired by https://github.com/debauchee/barrier/pull/461. Should fix pasting unicode on X11 https://github.com/debauchee/barrier/issues/344. --- doc/newsfragments/fix-x11-paste.bugfix | 1 + src/lib/platform/XWindowsClipboard.cpp | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 doc/newsfragments/fix-x11-paste.bugfix diff --git a/doc/newsfragments/fix-x11-paste.bugfix b/doc/newsfragments/fix-x11-paste.bugfix new file mode 100644 index 00000000..af4da5b1 --- /dev/null +++ b/doc/newsfragments/fix-x11-paste.bugfix @@ -0,0 +1 @@ + Map more X11 clipboard MIME types to corresponding converters (https://github.com/debauchee/barrier/issues/344). diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp index 8b417449..27321e5d 100644 --- a/src/lib/platform/XWindowsClipboard.cpp +++ b/src/lib/platform/XWindowsClipboard.cpp @@ -84,9 +84,13 @@ XWindowsClipboard::XWindowsClipboard(IXWindowsImpl* impl, Display* display, // add converters, most desired first m_converters.push_back(new XWindowsClipboardHTMLConverter(m_display, "text/html")); + m_converters.push_back(new XWindowsClipboardHTMLConverter(m_display, + "application/x-moz-nativehtml")); m_converters.push_back(new XWindowsClipboardBMPConverter(m_display)); m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display, "text/plain;charset=UTF-8")); + m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display, + "text/plain;charset=utf-8")); m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display, "UTF8_STRING")); m_converters.push_back(new XWindowsClipboardUCS2Converter(m_display, From 9a0bbbaaece33788eecfc5d97ae4da2ff2072e9e Mon Sep 17 00:00:00 2001 From: Jose Riha Date: Wed, 28 Apr 2021 13:51:26 +0200 Subject: [PATCH 03/12] Update Slovak translation --- src/gui/res/lang/gui_sk-SK.qm | Bin 1198 -> 39331 bytes src/gui/res/lang/gui_sk-SK.ts | 579 ++++++++++++++++++---------------- 2 files changed, 313 insertions(+), 266 deletions(-) diff --git a/src/gui/res/lang/gui_sk-SK.qm b/src/gui/res/lang/gui_sk-SK.qm index acdf4f60eb99126f5cfa7912ee3536c782542753..0e5efca0095914d34156d114b06b96297b90775d 100644 GIT binary patch literal 39331 zcmeHw33y!9mFAVK&9WA=1dIXmP;gl`mSh`4h!MiFyy8t*vH^!co~oXtvPxA&Es|xH zq)F0Q21q)A{s`$IlYOB>C!LKX9XcUo?@r@yw`b)eh#P2nuk{6@2{9OPp-q~ugw~c+t+8#Wq*Bfb1wT^x5}K$ z{+3>4c6Sb8-RVXA-kq!KKD^kNuDj|kUi>R#V$F41_C9RPzzY35 z(xIO>jnz#!nE%V`>(XOKfRA|HwLe&6%=!OTcl-TU8?)+xx_3=}(wMjZW!)F=>NJW>mJMw8gusd>KND!^FJin)US9vL*WPZ-va9O9`^tUB+|W_~`^V2gyUQ0f z+yOXN-nQtXoi~8i)-2ljA@sBNghj9Z$*G`&_b$4={w`yNnihTK{>_&lz*;(nbHWZ@)1ob~iNL`#sRllMOv9c452^H4G-+XN>)}hJ*Xw1^Rnu!+;ekznW7{(Q z9JU(1_ASuOMIUSU#wqt1^R`bmJoYr^v%I(AiSM==6Yp>M^*M*}d0oTPp9G#dH#hv- zw=V@>ysNS6GJJM?y0IsD%$SK-g@h^V{U3}TCoXqH@K#$yFCp$FijhK z(chkLHf6ZRD;QM~lUtBN%KKORiUAF>Xv0T%G zD*)H}bxluPiuoi8O~3eOeD>H)PyXyq@NK;5S8w_s;IliMo9;lnRi`vJ|LJqayzJrT z*7u)>cJFCE@YIc<<2#$DIG_E8o9E(RG3GxNn{Rq*1;)9e`K=e={pCMue(P5-zqY?^ z{>-D`>-KfcU;fdf#$5P?=0_Sf7<1|`Th9FH5b*ucmf?#AjOl+(%MIH>XNLz{UPpRq z{;QTZ{|jW*TkdLk%iC@Oy}evN*Zo01Z}~yXd;T-pzdG4+@0}R0Fy8XT6Mt*WflFJy zbl{yB@6ndO@4pprA8mR34IRd8s$YE3NsZvI{>7KJa9yrheA%1t!uqaU?A&?+#;tC^Xq?P z$)is_Xv|x0UhZV{Hcx0p6z1>F2rE>gOBZ-8TCA z#~`QvsqN60Hewz3x7}F>IGX-v+lQ}T1Na_kySpCrbzn)`7whtn^PknviO;k>5P!~? zt9GFs^DV4b$#*}gIR0N#7JJ@G@}|I)7ZV^co_ z|6bMpmSNy^@`LRk`Q{fuZ@+E->+f`6{objcZ#cRA%e!A`%#qKu-~S;8a{9{lZ+7390i;QzSjQaA6^gna!p6u_Fo(GrXwAv{uiuc^45-v>)!&t$#x7p){6D`dB+tG zK8k)`)iL+*jTrCoj`xg$o?iKyjt~CkKJeMY9iLqcx^;3LUw`01(CxC0=brc~bmna5 zS-YS=nhKrPNA^L!-qG3j_^sf#Z+E`p@zcPEcXUpjiGHqpdFRww?>A=np3Zl4T@QJX z>HNgMV!VND=MNWkfZum@{@BJiOYiUe?+;=AZ~R{8Z~pSFkazW9{y+P`BFw1C#LRv( z)q=11Zp@IU#vn&0rt6y7~hx zhZ%*xb9P1aLpbt){RzC2#dpqtBYhPAHkfs0J^tI{e!BqAM$83}Pg7D~tfcb3@!Xb#G!LYYIW6#gE@uVZct zLgKZ|qrGLi(QX(|XE6KKHQ_sq)gV>bfFL6@z!hR2(U1?}tvue#$SM(UIWvLvBE@hH z2LzHynKfrf*c|-7N51p#L76$RZJF)(B_Vy-Wl*+OjK2eT*o8KVLE9(J+8@i^-^#zE`4PW(3|97kLw(UWr0w9ChQN_b}QPQm;V zP!<5EJi`;N>@5BsLyt4&8T`e$kTcR)4gT7VCt)t=#mIz!tJw-J>jTvcc*3Uc$NkxX z*4@tBSjNsJEIXaBrZdI7W9299Trxdj+1YF=8Mh0`OuE+^%4PC-E1R+l?tJN_sid0 zCvR@Bh9+~#yfqS^%s6Rh+D@;v_9f#})|O1Fkij2^GN~yiXYH}m$4Up@V&`&6{DQ_g zC*?qJCahvQfhUDY$J(*)ptS=X=IoR;TpYvPtUbxNlg5<0cMR{D*|555Z)4I`CT$I6 z^3$1-Idn2HXN}ES2a<7MD`D+%9Kp$8!k)IaI~dZN;wVP;;M#F;7h&^zyDZdG)kz&n z=92{rXtrjZF?@9_tbjG?q_Q$%GCiKLy7P+L-gstub#H5bUv{9H8ZjqAiTg@Sm z_L#I*rm#WuRDMMfzf)iZs*K~p7Gza2l?6tb!+ROBRh{FHcgE0UCWCb+S=ez>xK+ql zStm#0CJajlvMS48QZGLz(n=a-x`XEbXOwhZmT`=wKQUrp+_b z9T}PU;aoi7lo3^F%hMUW8_eTndotjQcrlj;Nni%~c+PPI{m~QH05Mmf;I3cL{2G%}kk#3!v}+DasIju2RNEOuA) zs+y{t7=i^_>h`|?I#_2$!5!q7fPlG3d8~SvXUIWR?Ma^s&K#YD1ao-?-&~%7pq-tp zMR_e^D!@GRdum9yk|LT^+t@(tSlE3*qm(mVsE)KI;rFcn`l8JEc&)do$b+}*Gc{Q! z2{t5pbR7z?!e|L963bVGcKM_a#>+D4)SN{jGwD#l3YX@q1J)tPBI0SO1ha1xty;a^ z1tOc2y=mY463~`&nFCvh3mvfdTmUEKp|UsiRF(|yBx;QpaPa(( z45gAz+I8CKu)(a|h1O_+g=8PlKtMeWIT8(x*#btP)8IKdNz9MV5|OEH9hZ-eR$AK3 z_+y{GYa*S2hOvua_jo3qhCH$20)Y@#BtXl+_KrEKU4edwF<2Je=lyOMk2*&Sd+aeM zRdrUIp@~yq%^T4T=R=64lZ6pmNb9fKmM*xqSw8E;ljE+nDF#kJ8e$YI-6>k9Od)rf z-GGIzA>BUWm=Y^Y+yV16X%DjKk)17tGky?LQLck__p#C#+m=X**lFEsC)1ZF(~w=V z#BFFZ0$ZFmc`o$+_M}o{`THm0ePUg`0&-~J{5QsS!l)yB<*k-tj2Iv*3V(+oYl@8& z>|7*h9E#Qjodk-JaI;1<%R~;420x`I*$R(v=ozgS_&Nl4+H3Vz4XBEbn8moB$I)gbS2I28MRTZ%(!PDQ%E9C z!zT&5;PhIq8Ef^A4Xj+>-#0eEH((K4_KclO*<&e~oEfVhHdM|Tzqo7VhOPl>!Boah z^!M2Vy`JG-P5^%nr?-gts>Mspcv3`d+i}co0&md%b1F_K0|$ZZD(&GCpWwF-x?%`+uQl%21scCO=h`CdoIL!t z^bsJix3zU^#+u6%tyw!=AR?0Ke8EnoycaHsBCw89pWYv`*>$R-+H4p9go26D1V(N+ z3D3Nt*K)+R8|=hcqX>s+mMcI9>ug7|e94WTvy80&@~;EwGvu zx6{yNo`VMMMzWd}soU%G-fR+-lS6m__Oz=2VTIxkYK}2GJ~ff!5=COKyJ9Aaz3OXo zQV8N&>vB#-&uUY%=V$7O8Av&Q#ZM0P3RcJ!sx9}0&;S&xD!z#5(g-2ZPaVW4pVBuY zWFRkpD4&M&P7ac+HVr>iF$?XSOvIrw@E<9=sd*U?J1- z7HW?MDFeV%ftE;KFOcSifd@oEYS?%TeJh1gb_WwvX{BzKt9%6pjz|U0Ks2eE2;oQp z#>YL3!}6F;rXjT%B65zx{=ipQ>G07e5m>RDqlmi1GYN;%edT(Fa~R(m7?!w_l}Esb zgoXe;RX`S6fMJ=0Q-Gk)M-pA7V4$I*D5HcbM_Az5`7|E_+J`fj%jBXY#7;M20&_3T>v360#936LRvSviy`rV=78^7c$Qx}d{}u_$t1Gz=f=cdo!v3q-kAeINCKG-ad? zD@#kW1Hjuzbn{uO|D+KZY%@ZwqIcg`XZlWI@y#gb9UQ)sdU^%XIs zOGEvn-Wl|ji@8#$R8pxnqn1cuWObsCp_fv}pOzP)fFA;S_ZGh#qCt7bvkFKYRsaKj zdqQ+JAyZrtW*R4+YeLb^U%76Skem(w%ipQ{Y2J`b^*LLHvBG4P&c=(Gl9(x{nMTr9 z-H@4TF?eHpGglmOO^%V?@ZOyC&h_xfov;-_iA-P!91_OSBm`4%#8ByYo;4fxiMdt@ zpMnA#v=;ri(W+3Yg_i#$dQwk7Z6bOPd`e8He@%bK3ri|)zJeziv3Z7pRbrC(rX55a z1)hf`YZQcmJZjX03~|qP#E3Vx*H`JP@Xczl?2}P_9aeXXYepAx#XRh22IR(JI5@d1 z@-~G_T3c7HZ*7%09e%N)szl+3Ug;GpD?cf$jg&#whPhte4-Ir`xJ;V=Xt(Fwu2$vU z5LU0XYh2zb%x0`aCcUa)P1_7{I!6&9OwFz3k7+AeK#OcHGX@7}PDBa&b-_Zvt1!B1 zV5XhAMekDRj3K;%4w0xyA~9tlHGl=VsL!O2`M#e^Ha}kO#ck2iVK=zoc&S=s7Qr<1+8lMKu zWSJ}Hq{X}S!cjB`h{19X&!tPxMPwE$FD{`2^A{<({G=c`Sg%O*UQtsKGPxu{0#}?< zKouaI7<19QDQ#y80A+cK!DsNK7*>1RVaCBU1P{QZBZ1`S@&#wwvUBlCm<@4~RU~Xj zYr-aQVL>H$A@GHlmTtHveo7r}3POt9BIZB=#9k=yDYTGA!!HP7`1Z}l5bSPn!Sk@a z^F_pl?p*B0Y^hwI|#ra>-~9@vb^T#F7M$7YGwkU##0HaF*+SmH5;ej25fz4@Ymw%K_x7 zWx$K{mt`L6NzoP{hk7w9N&y;};W;{?Iqr7nn8?`^GRd?9cUt1Wu8_9E^G!H;gk%y{ zHiJwu)1I1?u&UzWHd&wWS}>!E@*^J$VKcarMpVag7M`_1M&#dW(}Xcp>DFovmzeir z8kC&D3SZ*R9!6-2u0NBLF456R;i9{4iiZ=By(iKO(XxA!JL3tA%G|66sajZ-Atf)G z6ZUS9u*^*4Pzu0E27L{vGV$*u$!k`UHu$LZM*Or+eF;aw1U(MUK8 z^MYr}rwgEd^hX)4_JmTFdPAPY4p{(cNBg&8UGQueqlV>-8yvyv@_7m}!`Ba>HTrXu z4(hK^4^TJJ+hA-;OS=ezMyNcGhxSYmd!;HZwcpty10Pd4KWq@Zr<7j2Xb__OZd@qt z`^n_>VmyxA>3EUmsmu6lEjv|!$vuGzfC8*#5S9{^hGCx$)6e$m+s4m5Sfj?%A0)H;xy3$%3awNSP z)mU671|hxjME*sNt;BdqbSWgr_7TT0va*?+otuk@%y=mUvC9Olfp`xDE#o=`Cmo5B zg;Xw;OXr6KjT*%ELJ1@`op?ARR4%tQ3REt*NMwqdATUraz7TAWbRjq@iIbrRDq^y# z7q;+XOhh`xBa=Pli6I7jg0#(R8Eh9ylZ*zGs7BCjOJYz_D^RXhRr2&&W$wUO5GkZo zh029T5Dv0IsLn>_dzMQAvOLvLs_{;UmDH)Zs;(o*&3ZM{sMun@mH4K;e;f)9>qrx# zM1!`*G_qNvqXatIP0tNoQRC2-qn#GSIaDK2-q1>=%3lbxP=5g}lB(^{!X4-2JOQoy-d(&SM%P>~-4t*CEN zn>vD`ypv-?70Xs*5aOqlWI}2`qGqpI zec=Y6Ic%gg#x5&rRzIp8Dd#Yjk&~dg3WMEWuAnlYIfgnhWN&H4MD?-^z3c)7k|zUh z50^eJiRrYhUBgw8dmky~Y7;QKvN4qXsumm>V zl29(V8dwWS>PA7e5y&L>sSu<`!5E|ZQdQszan&-9o*88aAF+yU#!1ap#rrv>^&m+_8fP@*h~|_(=S6!m6V(^_pb|?N-!;@?yOU)o zdV5rJl%=pk{NWl8ICetf2vMl*2>T5o0kP;nQT&XkHs_SK5k}?Ml=F<$B`C%H@mtZ8 zb$Rj_O1`Vj`V8=D2HYCrRq0e{#_y5K!ljJ)K4sL1uPYl7VXX*0rP)KXWkS}KTr4^Q?=tQY&A}Qg2!tp9 zR$Db}mj<5QW`UhnM+uW#6H@xme6Q;*l^P{5s_h_|6*WbxBpenw4FJicpf~m&;b!Nfi6(t z$00Y=%?m@!-$!2SWVK19`(dfwALNL?{o1s zR{nUoo9OlzU`r=O5A{rdyb)-gJ%Cg<_L2vV7#IwARST9xLvkL`}-H zotoI{*M^S4C~lCjG=)^! zd50Tso3)d*JMD)p8ju+!=`-L)#=03Lr!wJe!U;Ujnt38bc4sL)<^9|n43JQGQ1~!< z^=NREXgrL#1yB5~!9FdtL+2K=UYS^Rdg?9d(SugwppLPM;xFs z^Gezx?J_<$;IrM-rls&QKyALl%f_;C`wUm@z$!t zdGEY%QgQ_K7pO^dEsqeQz$2FUezmjW3b$f}^V1SwR%Sukg9|l8O%H+pXvNUliQLl^ z;`I?m;q!q5!yKlY!jyID_3{-CDrMnN1i4p9_9N|z1}N>6>}x`fun_vGinF@<7lh?EGu)tvE49Ofx_n&OFiUC--1Q{494h`U&@?R2HlP%znRpc&#egB`{Kw z)v-^PHqR1K8zu7pcq$#Znq# z*y%J0rD2g2GhDFK&tr6>=$YmufdZ1d1ZWY>#b4 zAP8Pq4m%o$Vn;(TE96UN4dEnHk~06a#WYSeIdt9D@z}@z-vD z*b~5E*3jVah_z?`&~Ea<{4i{NK``*lo4pYbEF}c{4(@#(09^Wl02sl<51{29@vh1d zaT38889K0k&z|Q2$;L1wU>VC?A)9!qpVY}AKVAV&S1*s=RS;-8g=1bZic%Y?hP@)m z(@&=D`B$I~n2bU6GHM;fz?$~Pu)k#i(xU~J87*K?rE(K6w*c#zTIwDv3;uh6m zW46B-nSLC3gyiRd64$0+uX2B%`wL5&wq|fb5(+n@Rvx(#C!E`q7g%tbS2qE_)8d2= znV*F5F9k|!h-!X)sg5N<1Xx5)N?f`H77X~1htAc}3=Zk?M9rS7D}4+-$_YS&Wvm#tR;?{u0PqCPL}Qkvyp8`fId)j;zN%@2dVGU+Fba& zNXCdNtTpiSw}Wf-wvYo3YPCNHNZ5_Zdl@NC_X&^~Bh(~!iTU^wZi(qB3u5-x>Xt_i z>=WDtyHy)vNQ-cNYc=Ev2QbQkY_IY(IH#s1wm-}I(s@T;xXE1$6rxu7*gXZvM*~c5 zIreA1$)9 zn4#nD=STCQJYKE2FM|oo(J<(C(t_c%p{%~ZE?N(ypV`yIp6@TLj+ z=_ML56!LoIRw^^wQ)m8OFYb!)c8WwQxA_*nE)ltnB)r{)%i#&qC{3?0m(PUZC@;`d zIrqvOH!B`nU5tmZR6b%*TmeF*-5{Z32G%^AgSZbiik8|ep0udGs%oe0RP`llW zV@yKE5lG*s9M4cn7O+Lq6`%9bhzU4>r7__XbTy=}^r2zw^7SHBSFV2$^7SgsNO81U zJRT^ervQWN1r1VJK2}6jL~J=9gP0!oQrT93;(2Gc6kd6t9m3(P#%(e8RHa%%uJVYd z>Ly3?0xga`kq2{CT5=SkwKr+P_Vz{O^0FhjxChd;_U2Q0tzrPN5-4N>?Q>%Dnn1K( z7_4SAjWL?CfZ+ir<^>FE;dl$$GsVO+gn8r=E#0J>Y!T%ENkD0faIho?E4elZ1TG(m z&86d$xl9@=%#)~j>}Jq7Z7nd?Ryb%R??Aj$H&GA}xWJ(~L7fY5GOD3d$@J8`s;9dm zpQooGaHOy<4aPWGodX>I8meQTZ&BBjT7>AFd_W%bIF=iv$`15&&v1;{lg189rHTUZQJ2U%@$h_0#h;s6Qswot~b=3}&g~ zWxn!Ru%#EG)m$(0O=M2ujig0OkNa0Wk}InpaL?NqMGMUka)Yt@Q*2Y7P}kL9LfvzI zDIocjRwsiGtU%ISGyBVl55oHKBU0ZS3Lz;D7+*=ycS(p_&E}vt8{PIW(!bzF4CEFPh~f~*0xfJ;F4hPox7VZ=g2`3X$Rh| zyY08bi>ii#M%$5ee+k&imlmC6Fj06$jXO|QJRKCxDCsDfks!3lK_t0|!_vy8lce;S zM^Z^;9cHSVfTPA_f^P)<$zB>E1u~Nod9Xz?*b2Nf#$5(<^kn0mo}P;6o9=c{B>Dlf z4d{Hh3MbNhqr^BSrUomiXyyiS^(C=gj8Bf+am{m88-qE{OF`eqz<1$o6s<8F3_nps z;hqHit2IBz{3ALbAaI;T=#*o*7y_y@hK&v=ft|2GWsat>tM$xC&H)Gt7P|$?3b|mM zCgP-0cG|&dCM1Pw9dKcQ6Yx8MI}UttJ3-k#>rhVq1O&@)0!wZRJE(Mfb*j%9LMGf<6Eo@Y7_b{$SD^3!?MdVL<-AF6e6wIIW{ zQ@CEVwf7Jp?*=SJG)8_sR8Z}xy?w!`-?OfyU zGy^B`Rvv~Awk`QI*yC39N^(n2tK!+9DQ|n5*cn+npNF8-BVU$4c@?u-=k1o74$Cxy zb7ypmwPKj|lAe!CACw7df}>%^a1J7T&gn82s5}f7oFRnNSVq=Bq9zsNznFU8iq5ov zhg&3*P$IH+A{J=i(W&AMMEJjtzoju=Rv|VWwr0DAgVy~jihSk%8W1JZKvdhzdeM;f z%x-l@7)hb~!BwJqf1VqmeVERB0o$NSiIHHB2`_Q-8Yw5(FY$gWAMg#{rrw3`wyFwu zH{d2+5}6FjBD*6CNy}arSECm}AZlrBWGacbhzcMGR)_aHIehpfVR_?zFh;?1okEjEIv*2!<%;J-!}Bz0|qZZ45Z9P>5IN0jng{agTgtd&0^^0i_6Bo4U@Mfp!)vH`7ANtzNmglH*&6|Dn}Aj7ZuM0!a`D8g z>?lvYdFl-K4zC8Ij_bj1jAU#A4P>!a#82t(!~`je?ojo&xN=ejS+yV1mN%DRtR7HH z0Z`DpXMAG{-wBu6yPUVq*`tHXUlnT7MZdfD+*MXS=V;6;&e?W1+UOj0KfZYFb-~FI z)I!uqN>Sc9S)^rp4u~J%S5=w}bulKy=anLw@9>|7yjT}KD)`k%4UINEfG&s+DFq{) zgg&EgFLHxtXjeVeLyT5C5rZ%s!oO!^1xUNZULe60S}$7TRnl|4iD%W)`W@;igfTti zU%4?YtJ4PxQ%>`^%i}whL;j^{^>_B4y>-zGA zTrythO%xJc1FijhIM6?d^5%j5Y1GV#J$iB1wRmT;fXg|$n0m(XHie73)_3vFwR~ZY z*9u^-=EYrnp)a1#qoeFv1jDWCa4ipxE9}W<=}se(;`Ges?CeF>4Y(vsS`PI0>0o1- z1kWl$XBT&&S}Wt)*F00y7xr#AKU;90%sRaE zZPUhe>%3Rk+a}yofW#P#_^&2Q_i7BcnRD287YHTC0Rx(8qhuw9?tQ3#5pdSr({nK$D)DA zuoaGw;<2l4tpR|O-jGo&W^qRZr-Nn7;vW}{D@dZLWSQQUno7Bh9BWt1GkVWNlWNt-L)5~G z7|o~cG>#$EOVyCbdQn=~ybfBJ+z`IgivANl<2<|x`qR}x(2qx zV#NWdUg(VXR8_MyaJTHBAC+)JPX4GZUVN!q>qV8_(o5ZVK%Oe%2`52 znOJ%CIX!VmbMZ)cfw$+Q=&H`|O%Wy?Un_p~)YYicFfUSB&BM|eg#9?mZPhwnttjWn znG``$)E}kzq4eKda=R4s4qO`+6R~ai3h{Dlj-lrRXy8{pJ1st95tE$bjkdvA0vWCX zFy?AIv?sR0S?gexIG?cQ;+&}WsJV20szEF38yHz(DAPMFqm)8)Y%Lg}*UnKGu4W`r zPuu4mY)UD*)v&bwR?jxy3#`P^X1~N_uD~~9X%G4$?;b^utAns?-C^&n02Cj(C*|9D zcx7@+x8&wo)yOP)_%KK~5QSMLGp38FLK0^-_)bfn8C>xua1{8|T4^QsGi*olL;l*& zYrRKs+XJrkwl3uj6BYisNgiQ zxj+Lco0W4cv89Ub!-5a&<~JeF>5L(y8QcR#kBpa-_xP8ScQY3%6Lo8n z*IIk+xV3-8xuzsAwG$?Ib6uMnd&sate_hCh9r>Aqz=J z=oF@8Og+|_Myj$hNt(isNq#bw8iou5fy^NQXv~Ip(Uh{{*}l?PF^bLWSW6x|>)s_n zHSRLS+0|4Dwyz(;NE}5DjrRL%zT8QHR3+UQIlaw@TC+NyKrWkNt7*`rwbA)q4Sq;^-4m{&k5hbLfAV-@~NTVOdZKWz4#NMi1-(L08(LI|wk zVCd5hC@6Htea9ia5>$3}xd)^D8&kU=3U0ii@(Uk>B!#Q;R5RfW($gd zu}$KlYUF9ptgo*;utL=>shueya;Ea(F~H7Uj+}*FH2jQ=7FKhf36KH2RJ*)cL=zS~ zu9(V=TuZS=vx$B4%sg`WGr}U20&lAh;NS(!LWQh4PA0+EbU=H|o> z&+rBS9P&+r+&zX%4teqp7op{j1eW~HTVikxi>Izo4mQJ5BsLv~ai77>kQ4sRd%XRK zthM-ZXH12oaMiC$mWBLH5ysdxZ8tA=K8a}_$5WE9S`Dyf{-0im^!y8vPfp;DCTLVQ zSzV6$7m4{a(*Mju@h%l5=t`y_Ifc&$i((4ecS?$?JSdMnw%|=~?#*#NqxRwqu`p>_ zdW{85o-)$Jol=oB^Y;IPknaaGkt$h?)`^*gV=UaJEVttMbKCrU=H?m;@aMAF59w^G zGTYl;(%Djns->*?rqZ&GVi(L0{{jh1 z_cy&Te81FW)Ll9&k9ZbDHw`5ku3kk(=V1qx%-9w}WF+HySmZ*EH;-(12C}`p9XF6{ z%-_5B;WI0b5gumx?j^1Vz|JL3m!A4o2Ex^o1UP-U&~4E6Ha* z+Ln`A7#$7W%0Y~PfU8cu9}BOsp$YVb<-r(?2bE8uB)o%6 fBl%+CV}}W@`q=L3&pY;;VMsRB)%|-zeZ&6-9lmbj delta 282 zcmZ3ynQ0xTmd%b7iBs?AOg*b8vp-?s-n&i=3=9GctSsk&Gy~IlOFtlGpUJ?$QaSl; zt`if}p2_U3(*qS4@)!~s6c~ybN*MAPau`w>bb!1pAgurvQDCS7%BKKv5koFeg#uW$ zKSKdfMIMkB3=}H`$|VE&dO*I< + + + AboutDialogBase About Barrier - + O Barrier - + <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> @@ -26,22 +28,30 @@ Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> - + <p> +Aplikácia na zdieľanie klávesnice a myši. Podporuje viacero platforiem a má otvorený zdrojový kód.<br /><br /> +Autorské práva © 2012-2016 Symless Ltd.<br /> +Autorské práva © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> +Barrier je vydaný pod licenciou GNU General Public License (GPLv2).<br /><br /> +Základom pre Barrier je CosmoSynergy od Richarda Lee-a a Adama Federa.<br /> +Barrier GUI je postavené na QSynergy od Volkera Lanza.<br /><br /> +Pre pomoc a ďalšie informácie navštívte našu webovú stránku (symless.com). +</p> Unknown - + Neznáma Version: - + Verzia: &Ok - + &Ok @@ -49,97 +59,97 @@ Visit our website for help and info (symless.com). Configure Action - + Nastaviť akciu Choose the action to perform - + Vyberte akciu, ktorá sa má vykonať Press a hotkey - + Stlačte klávesovú skratku Release a hotkey - + Uvoľnite klávesovú skratku Press and release a hotkey - + Stlačte a uvoľnite klávesovú skratku only on these screens - + iba na týchto obrazovkách Switch to screen - + Prepnúť na obrazovku Switch in direction - + Prepnúť v smere left - + doľava right - + doprava up - + hore down - + dole Lock cursor to screen - + Zamknúť kurzor na obrazovke toggle - + prepnúť on - + zap off - + vyp This action is performed when - + Táto akcia sa vykoná pri the hotkey is pressed - + stlačení klávesovej skratky the hotkey is released - + uvoľnení klávesovej skratky @@ -147,17 +157,17 @@ Visit our website for help and info (symless.com). Dialog - + Dialógové okno TextLabel - + TextovýPopis Ignore auto connect clients - + Ignorovať automatické pripojenia klientov @@ -165,12 +175,12 @@ Visit our website for help and info (symless.com). Hotkey - + Klávesová skratka Enter the specification for the hotkey: - + Vložte popis klávesovej skratky: @@ -178,189 +188,193 @@ Visit our website for help and info (symless.com). &Start - + S&pustiť &File - + &Súbor &Edit - + &Upraviť &Window - + &Okno &Help - + &Pomocník <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - + <p>Vaša verzia Barrier nie je aktuálna. Na <a href="%2">stiahnutie</a> je k dispozícii verzia <b>%1</b>.</p> Program can not be started - + Program sa nepodarilo spustiť The executable<br><br>%1<br><br>could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program. - + Súbor <br><br>%1<br><br>sa nepodarilo spustiť aj napriek tomu, že existuje. Prosím, skontrolujte, či máte dostatočné práva na spustenie tohto programu. Barrier client not found - + Nepodarilo sa nájsť klienta Barrier The executable for the barrier client does not exist. - + Spustiteľný súbor klienta barrier neexistuje. Hostname is empty - + Názov hostiteľa je prázdny Please fill in a hostname for the barrier client to connect to. - + Prosím, vyplňte názov hostiteľa, ku ktorému sa klient barrier má pripojiť. Cannot write configuration file - + Nepodarilo sa zapísať súbor s konfiguráciou The temporary configuration file required to start barrier can not be written. - + Nepodarilo sa zapísať do dočasného súboru, ktorý je potrebný pre spustenie barrier. Configuration filename invalid - + Neplatný názov konfiguračného súboru You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - + Nezadali ste platný konfiguračný súbor pre server barrier. Želáte si teraz vybrať súbor s konfiguráciou? Barrier server not found - + Server barrier nebol nájdený The executable for the barrier server does not exist. - + Spustiteľný súbor servera barrier neexistuje. Barrier terminated with an error - + Barrier skončil s chybou Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - + Barrier bolo neočakávane ukončený s chybovým kódom %1.<br><br>Podrobnosti nájdete v súbore s protokolom. &Stop - + &Zastaviť Please add the server (%1) to the grid. - + Pridajte, prosím, server (%1) do mriežky. Please drag the new client screen (%1) to the desired position on the grid. - + Ťahaním presuňte obrazovku nového klienta (%1) na požadovanú pozíciu v mriežke. Failed to detect system architecture. - + Nepodarilo sa zistiť systémovú architektúru. Cancel - + Zrušiť Failed to download Bonjour installer to location: %1 - + Nepodarilo sa stiahnuť inštalátor Bonjour do umiestnenia: %1 Do you want to enable auto config and install Bonjour? This feature helps you establish the connection. - + Želáte si povoliť autokonfiguráciu a nainštalovať Bonjour? + +Táto funkcia vám pomôže s nadväzovaním spojenia. Auto config feature requires Bonjour. Do you want to install Bonjour? - + Funkcia autokonfigurácie vyžaduje Bonjour. + +Želáte si nainštalovať Bonjour? Barrier is starting. - + Barrier sa spúšťa. Barrier is running. - + Barrier je spustený. Barrier is not running. - + Barrier nie je spustený. Unknown - + Neznáma Barrier - + Barrier Browse for a barriers config file - + Vybrať súbor s konfiguráciou barrier Barrier is now connected, You can close the config window. Barrier will remain connected in the background. - + Barrier je pripojený, môžete zavrieť okno s nastaveniami. Barrier zostane bežať na pozadí. Security question - + Bezpečnostná otázka @@ -368,25 +382,31 @@ Do you want to install Bonjour? %1 -This is a server fingerprint. You should compare this fingerprint to the one on your server's screen. If the two don't match exactly, then it's probably not the server you're expecting (it could be a malicious user). +This is a server fingerprint. You should compare this fingerprint to the one on your server's screen. If the two don't match exactly, then it's probably not the server you're expecting (it could be a malicious user). To automatically trust this fingerprint for future connections, click Yes. To reject this fingerprint and disconnect from the server, click No. - + Dôverujete tomuto otlačku? + +%1 + +Toto je digitálny otlačok servera. Mali by ste ho porovnať s otlačkom na jednej z obrazoviek vášho servera. Ak nie sú rovnaké, potom sa pravdepodobne nepripájate na server, na ktorý chcete (môže sa jednať o zlomyselného používateľa). + +Ak chcete automaticky dôverovať tomuto otlačku pri ďalších spojeniach, kliknite na Áno. Pre odmietnutie tohto otlačku a odpojenie od servera kliknite na Nie. Save configuration as... - + Uložiť konfiguráciu ako... Save failed - + Chyba pri ukladaní Could not save configuration to file. - + Nepodarilo sa uložiť súbor s konfiguráciou do súboru. @@ -394,168 +414,168 @@ To automatically trust this fingerprint for future connections, click Yes. To re Barrier - + Barrier - Ser&ver (share this computer's mouse and keyboard): - + Ser&ver (share this computer's mouse and keyboard): + Ser&ver (zdieľať klávesnicu a myš tohto počítača): Screen name: - + Názov obrazovky: &Server IP: - + &IP servera: &Start - + S&pustiť Use existing configuration: - + Použiť existujúcu konfiguráciu: &Configuration file: - + Sú&bor s konfiguráciou: &Browse... - + &Prechádzať... Configure interactively: - + Interaktívna konfigurácia: &Configure Server... - + &Konfigurovať server... Ready - + Pripravené Log - + Protokol &Reload - + &Znovu načítať IP addresses: - + IP adresy: Fingerprint: - + Otlačok: - &Client (use another computer's mouse and keyboard): - + &Client (use another computer's mouse and keyboard): + &Klient (používa klávesnicu a myš iného počítača): Auto config - + Automatická konfigurácia &About Barrier... - + &O Barrier... &Quit - + &Ukončiť Quit - + Ukončiť Run - + Spustiť S&top - + Za&staviť Stop - + Zastaviť S&how Status - + Zo&braziť stav &Hide - + &Skryť Hide - + Skryť &Show - + Z&obraziť Show - + Zobraziť Save configuration &as... - + Uložiť konfiguráciu &ako... Save the interactively generated server configuration to a file. - + Uložiť interaktívne vygenerovanú konfiguráciu serveru do súboru. Settings - + Nastavenia Edit settings - + Upraviť nastavenia Run Wizard - + Spustiť sprievodcu @@ -563,7 +583,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Unnamed - + Bezmena @@ -571,28 +591,29 @@ To automatically trust this fingerprint for future connections, click Yes. To re Failed to get plugin directory. - + Nepodarilo sa získať adresár s pluginmi. Failed to get profile directory. - + Nepodarilo sa získať adresár s profilom. - Failed to download plugin '%1' to: %2 + Failed to download plugin '%1' to: %2 %3 - + Nepodarilo sa stiahnuť plugin '%1' do: %2 +%3 Could not get Windows architecture type. - + Nepodarilo sa zistiť typ architektúry Windows. Could not get Linux architecture type. - + Nepodarilo sa zistiť typ architektúry Linuxu. @@ -600,48 +621,48 @@ To automatically trust this fingerprint for future connections, click Yes. To re Setup Barrier - + Nastaviť Barrier Please wait... - + Čakajte prosím... Error: %1 - + Chyba: %1 Setup complete. - + Nastavovanie dokončené. - Downloading '%1' plugin (%2/%3)... - + Downloading '%1' plugin (%2/%3)... + Sťahujem plugin '%1' (%2/%3)... Plugins installed successfully. - + Pluginy úspešne nainštalované. Generating SSL certificate... - + Generujem SSL certifikát... Downloading plugin: %1 (1/%2) - + Sťahujem plugin: %1 (1/%2) Getting plugin list... - + Získavam zoznam pluginov... @@ -649,22 +670,22 @@ To automatically trust this fingerprint for future connections, click Yes. To re All files (*.*) - + Všetky súbory (*.*) Barrier Configurations (*.sgc) - + Konfiguračné súbory Barrier (*.sgc) Barrier Configurations (*.conf) - + Konfiguračné súbory Barrier (*.conf) System tray is unavailable, quitting. - + Systémová oblasť nie je dostupná, končím. @@ -672,22 +693,22 @@ To automatically trust this fingerprint for future connections, click Yes. To re Screen name is empty - + Názov obrazovky je prázdny The screen name cannot be empty. Please either fill in a name or cancel the dialog. - + Názov obrazovky nemôže byť prázdny. Zadajte, prosím, názov alebo zrušte toto dialógové okno. Screen name matches alias - + Názov obrazovky koliduje s jej alternatívnym názvom The screen name cannot be the same as an alias. Please either remove the alias or change the screen name. - + Názov obrazovky nemôže byť rovnaký ako jej alternatívny názov. Prosím, odstráňte alternatívny názov alebo zmeňte názov obrazovky. @@ -695,37 +716,37 @@ To automatically trust this fingerprint for future connections, click Yes. To re Screen Settings - + Nastavenia obrazovky Screen &name: - + &Názov obrazovky: A&liases - + &Alternatívne názvy &Add - + &Pridať &Remove - + O&dstrániť &Modifier keys - + &Modifikátory klávesov &Shift: - + &Shift: @@ -734,7 +755,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Shift - + Shift @@ -743,7 +764,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Ctrl - + Ctrl @@ -752,7 +773,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Alt - + Alt @@ -761,7 +782,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Meta - + Meta @@ -770,7 +791,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Super - + Super @@ -779,82 +800,82 @@ To automatically trust this fingerprint for future connections, click Yes. To re None - + Žiadny &Ctrl: - + &Ctrl: Al&t: - + Al&t: M&eta: - + M&eta: S&uper: - + S&uper: &Dead corners - + &Mŕtve rohy Top-left - + Vľavo hore Top-right - + Vpravo hore Bottom-left - + Vľavo dole Bottom-right - + Vpravo dole Corner Si&ze: - + Veľ&kosť rohov: &Fixes - + &Opravy Fix CAPS LOCK key - + Opraviť správanie klávesu CAPS LOCK Fix NUM LOCK key - + Opraviť správanie klávesu NUM LOCK Fix SCROLL LOCK key - + Opraviť správanie klávesu SCROLL LOCK Fix XTest for Xinerama - + Opravit XTest pre Xinerama @@ -862,7 +883,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re <center>Screen: <b>%1</b></center><br>Double click to edit settings<br>Drag screen to the trashcan to remove it - + <center>Obrazovka: <b>%1</b></center><br>Dvojitým kliknutím upravíte nastavenia<br>Pre odstránenie obrazovky ju myšou presuňte do koša @@ -870,7 +891,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Configure server - + Konfigurovať server @@ -878,166 +899,168 @@ To automatically trust this fingerprint for future connections, click Yes. To re Server Configuration - + Konfigurácia servera Screens and links - + Obrazovky a prepojenia Drag a screen from the grid to the trashcan to remove it. - + Pre odstránenie obrazovky ju chyťte a presuňte z mriežky do koša. Configure the layout of your barrier server configuration. - + Nastaviť rozloženie konfigurácie vášho servera barrier. Drag this button to the grid to add a new screen. - + Pre vytvorenie novej obrazovky presuňte toto tlačidlo do mriežky. Drag new screens to the grid or move existing ones around. Drag a screen to the trashcan to delete it. Double click on a screen to edit its settings. - + Ťahaním pridajte nové obrazovky do mriežky alebo presuňte existujúce. +Presuňte obrazovku do koša, ak ju chcete odstrániť. +Dvojitým kliknutím na obrazovku upravíte jej nastavenia. Hotkeys - + Klávesové skratky &Hotkeys - + &Klávesové skratky &New - + &Nový &Edit - + &Upraviť &Remove - + O&dstrániť A&ctions - + &Akcie Ne&w - + No&vý E&dit - + U&praviť Re&move - + Ods&trániť Advanced server settings - + Pokročilé nastavenia serveru &Switch - + &Prepnúť Switch &after waiting - + Prepnúť &po prestávke ms - + ms Switch on double &tap within - + Prepnúť po &dvojitom ťuknutí počas &Options - + &Možnosti &Check clients every - + K&ontrolovať klientov každých Use &relative mouse moves - + Používať &relatívne pohyby myši S&ynchronize screen savers - + &Synchronizovať šetriče obrazovky - Don't take &foreground window on Windows servers - + Don't take &foreground window on Windows servers + Na serveroch s &Windows sa neprepínať do popredia Ignore auto config clients - + Ignorovať klientov s autokonfiguráciou &Dead corners - + &Mŕtve rohy To&p-left - + &Vľavo hore Top-rig&ht - + Vpravo &dole &Bottom-left - + &Vľavo dole Bottom-ri&ght - + V&pravo dole Cor&ner Size: - + &Veľkost rohov: @@ -1045,19 +1068,21 @@ Double click on a screen to edit its settings. Save log file to... - + Uložiť súbor s protokolom do... Elevate Barrier - + Zvýšiť stupeň oprávnení pre Barrier Are you sure you want to elevate Barrier? This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. - + Naozaj chcete zvýšiť stupeň oprávnení pre Barrier? + +Toto umožní Barrier pracovať s procesmi, ktoré majú takisto vyšší stupeň oprávnení a s oknom riadenia používateľských účtov (UAC), ale môže to tiež spôsobiť problémy aplikáciam s bežnými oprávneniami. Túto možnosť by ste mali použiť iba, ak ju skutočne potrebujete. @@ -1065,107 +1090,107 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but Settings - + Nastavenia Sc&reen name: - + &Názov obrazovky: P&ort: - + P&ort: &Interface: - + &Používateľské rozhranie: Elevate mode - + Režim oprávnení &Hide on startup - + &Skryť pri spustení &Network Security - + Sieťová &bezpečnosť Use &SSL encryption (unique certificate) - + Používať šifrovanie &SSL (jedinečný certifikát) Logging - + Protokolovanie &Logging level: - + Ú&roveň protokolu: Log to file: - + Protokol ukladať do súboru: Browse... - + Prechádzať... Error - + Chyba &Language: - + &Jazyk: &Miscellaneous - + &Rôzne Warning - + Varovanie Note - + Poznámka Info - Informácie + Informácie Debug - + Ladenie Debug1 - + Ladenie1 Debug2 - + Ladenie2 @@ -1173,17 +1198,17 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but Setup Barrier - + Nastaviť Barrier Please select an option. - + Prosím, vyberte si jednu z možností. Please enter your email address and password. - + Zadajte, prosím, vašu emailovú adresu a heslo. @@ -1191,85 +1216,93 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but Setup Barrier - + Nastaviť Barrier Welcome - + Vitajte Thanks for installing Barrier! - + Ďakujeme, že ste sa rozhodli nainštalovať Barrier! - Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). - Barrier vám umožní ľahko zdieľať myš a klávesnicu medzi viacerými počítačmi na stole, je to zadarmo a Open Source. Len presunúť kurzor myši mimo okraj jedného počítača na obrazovke na ďalšie. Môžete dokonca zdieľať všetky vaše schránok. Všetko, čo potrebujete, je pripojenie k sieti. Barrier je cross-platformové (práca na Windows, Mac OS X a Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier vám umožní ľahko zdieľať myš a klávesnicu medzi viacerými počítačmi, je zadarmo a má otvorený zdrojový kód. Stačí len presunúť kurzor myši mimo okraj obrazovky jedného počítača a presuniete sa na druhý počítač. Môžete dokonca zdieľať všetky vaše schránky. Všetko, čo potrebujete, je pripojenie k sieti. Barrier podporuje viacero platforiem (funguje vo Windowse, Mac OS X a Linuxe). Activate - + Aktivovať &Activate now... - + &Aktivovať teraz... Email: - + Email: Password: - + Heslo: <a href="https://symless.com/account/reset/">Forgot password</a> - + <a href="https://symless.com/account/reset/">Zabudnuté heslo</a> &Skip activation - + &Preskočiť aktiváciu - &Server (share this computer's mouse and keyboard) - + &Server (share this computer's mouse and keyboard) + &Server (zdieľať klávesnicu a myš tohto počítača) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</span></p></body></html> - +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">K tomuto počítaču je pripojená moja hlavná klávesnica a myš. Toto vám umožní presunúť kurzor myši na obrazovku iného počítača. V úlohe servera môže byť len jeden počítač.</span></p></body></html> - &Client (use another computer's mouse and keyboard) - + &Client (use another computer's mouse and keyboard) + &Klient (použiť klávesnicu a myš iného počítača) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</span></p></body></html> - +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Server už ste nastavili. Tento počítač bude ovládaný klávesnicou a myšou pripojenou k serveru. V roli klienta môže byť viacero počítačov.</span></p></body></html> Server or Client? - + Server alebo klient? @@ -1277,22 +1310,22 @@ p, li { white-space: pre-wrap; } Failed to get profile directory. - + Nepodarilo sa získať adresár s profilom. SSL certificate generated. - + SSL certifikát bol vygenerovaný. SSL fingerprint generated. - + SSL otlačok bol vygenerovaný. Failed to find SSL fingerprint. - + Nepodarilo sa nájsť otlačok SSL. @@ -1300,7 +1333,7 @@ p, li { white-space: pre-wrap; } Unknown - + Neznáma @@ -1310,19 +1343,23 @@ p, li { white-space: pre-wrap; } An error occurred while trying to sign in. Please contact the helpdesk, and provide the following details. %1 - + Počas pokusu o prihlásenie došlo k chybe. Prosím, kontaktujte zákaznickú podporu a poskytnite im nasledujúce údaje. + +%1 Login failed, invalid email or password. - + Prihlásenie nebolo úspešné, neplatná emailová adresa alebo heslo. Login failed, an error occurred. %1 - + Prihlásenie nebolo úspešné, nastala chyba. + +%1 @@ -1331,26 +1368,33 @@ p, li { white-space: pre-wrap; } Server response: %1 - + Prihlásenie nebolo úspešné, nastala chyba. + +Odpoveď servera: +%1 An error occurred while trying to query the plugin list. Please contact the help desk, and provide the following details. %1 - + Počas získavania zoznamu pluginov došlo k chybe. Prosím, kontaktujte zákaznickú podporu a poskytnite im nasledujúce údaje. + +%1 Get plugin list failed, invalid user email or password. - + Zlyhalo získavanie zoznamu pluginov, neplatná emailová adresa alebo heslo. Get plugin list failed, an error occurred. %1 - + Zlyhalo získavanie zoznamu pluginov, nastala chyba. + +%1 @@ -1359,7 +1403,10 @@ Server response: Server response: %1 - + Zlyhalo získavanie zoznamu pluginov, nastala chyba. + +Odpoveď servera: +%1 @@ -1367,44 +1414,44 @@ Server response: zeroconf server detected: %1 - + detegovaný zeroconf server: %1 zeroconf client detected: %1 - + detegovaný zeroconf klient: %1 Zero configuration service - + Služba Zero configuration Error code: %1. - + Kód chyby: %1. Unable to start the zeroconf: %1. - + Nepodarilo sa spustiť zeroconf: %1. Barrier - + Barrier Failed to get local IP address. Please manually type in server address on your clients - + Nepodarilo sa získať miestnu IP adresu. Zadajte, prosím, adresu servera ručne v nastaveniach vašich klientov %1 - + %1 - \ No newline at end of file + From cdc6e684eb9ef43a0de8915ed3510886d14b8a35 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Mon, 21 Jun 2021 21:31:09 +0300 Subject: [PATCH 04/12] Add newsfragment --- doc/newsfragments/translation_slovak.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/newsfragments/translation_slovak.bugfix diff --git a/doc/newsfragments/translation_slovak.bugfix b/doc/newsfragments/translation_slovak.bugfix new file mode 100644 index 00000000..ff46ce94 --- /dev/null +++ b/doc/newsfragments/translation_slovak.bugfix @@ -0,0 +1 @@ +Updated Slovak translation. From e80184ce7ac6e889e9ed51a4342688f8f42cc6c4 Mon Sep 17 00:00:00 2001 From: Tomoya Tanjo Date: Tue, 22 Jun 2021 23:24:36 +0900 Subject: [PATCH 05/12] Fix osx_environment.sh for Homebrew --- osx_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx_environment.sh b/osx_environment.sh index 09fa3479..0c725fb1 100644 --- a/osx_environment.sh +++ b/osx_environment.sh @@ -29,7 +29,7 @@ if [ ! $BARRIER_BUILD_ENV ]; then elif command -v brew; then printf "Detected Homebrew\n" - QT_PATH=$(brew --prefix qt) + QT_PATH=$(brew --prefix qt@5) OPENSSL_PATH=$(brew --prefix openssl) check_dir_exists "$QT_PATH" 'qt' From ac5de110c0941e3a2da1f2cd0b7ade4fa26c9bdf Mon Sep 17 00:00:00 2001 From: Tomoya Tanjo Date: Wed, 23 Jun 2021 01:05:58 +0900 Subject: [PATCH 06/12] Update build_dist.sh.in --- dist/macos/bundle/build_dist.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/macos/bundle/build_dist.sh.in b/dist/macos/bundle/build_dist.sh.in index c96da790..3d5c333f 100755 --- a/dist/macos/bundle/build_dist.sh.in +++ b/dist/macos/bundle/build_dist.sh.in @@ -48,7 +48,7 @@ fi # Check for macdeployqt on Homebrew if which -s brew ; then info "Homebrew found, searching for macdeployqt" - DEPLOYQT="$(brew list qt | grep --only '/.*macdeployqt' | head -1)" + DEPLOYQT="$(brew list qt@5 | grep --only '/.*macdeployqt' | head -1)" if [ ! -x "$DEPLOYQT" ]; then error Please install package qt exit 1 @@ -70,4 +70,4 @@ else -executable="$B_BARRIERC" \ -executable="$B_BARRIERS" || exit 1 success "Bundle created successfully" -fi \ No newline at end of file +fi From 5dc27b12013420a88957ea32bbc396dd996db426 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Wed, 23 Jun 2021 15:36:06 +0300 Subject: [PATCH 07/12] README: Switch IRC contact info to libera network --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b81d6f0..9a034e65 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ and a [snap](https://snapcraft.io/barrier). ### Contact info: -- `#barrier` on freenode +- `#barrier` on libera IRC network #### CI Build Status From c25837fc621ff8bf8ec0543586a45eb954a6abcf Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Wed, 23 Jun 2021 15:50:31 +0300 Subject: [PATCH 08/12] azure-pipelines: Download from official qt source The previous source seems to be rate-limited and otherwise not properly available which causes Windows builds to time out. --- azure-pipelines/download_install_qt.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/download_install_qt.ps1 b/azure-pipelines/download_install_qt.ps1 index c2c23220..e31b9b7a 100644 --- a/azure-pipelines/download_install_qt.ps1 +++ b/azure-pipelines/download_install_qt.ps1 @@ -21,6 +21,6 @@ Write-Output 'Installed QLI Installer Dependencies' Write-Output 'Starting QT Installer' $Env:QLI_OUT_DIR = ".\deps\Qt\Qt$qt_version" -$Env:QLI_BASE_URL = "http://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/" +$Env:QLI_BASE_URL = "https://download.qt.io/online/qtsdkrepository/" python .\deps\qli-installer\qli-installer.py $qt_version windows desktop win64_msvc2017_64 Write-Output 'Installed QT Installer' From ebb8f101de46951c5860b0cc11840f4a41f02555 Mon Sep 17 00:00:00 2001 From: Jonathan Newnham Date: Mon, 1 Feb 2021 14:53:42 +1100 Subject: [PATCH 09/12] README: Add quickstart instructions --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 9a034e65..5ac8a16d 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,20 @@ Compatibility. We use more than one operating system and you probably do, too. W Communication. Everything we do is in the open. Our issue tracker will let you see if others are having the same problem you're having and will allow you to add additional information. You will also be able to see when progress is made and how the issue gets resolved. +### Usage + +Install and run barrier on each machine that will be sharing. +On the machine with the keyboard and mouse, make it the server. + +Click the "Configure server" button and drag a new screen onto the grid for each client machine. +Ensure the "screen name" matches exactly (case-sensitive) for each configured screen -- the clients' barrier windows will tell you their screen names (just above the server IP). + +On the client(s), put in the server machine's IP address (or use Bonjour/auto configuration when prompted) and "start" them. +You should see `Barrier is running` on both server and clients. +You should now be able to move the mouse between all the screens as if they were the same machine. + +Note that if the keyboard's Scroll Lock is active then this will prevent the mouse from switching screens. + ### Contact & support Please be aware that the *only* way to draw our attention to a bug is to create a new issue in [the issue tracker](https://github.com/debauchee/barrier/issues). Write a clear, concise, detailed report and you will get a clear, concise, detailed response. Priority is always given to issues that affect a wider range of users. From 63d60a14f85424e43508535d5ba2f14e4820e6ec Mon Sep 17 00:00:00 2001 From: gloomy-ghost Date: Sun, 11 Apr 2021 03:33:55 +0000 Subject: [PATCH 10/12] update zh-CN translations --- doc/newsfragments/translation_chinese.bugfix | 1 + src/gui/res/lang/gui_zh-CN.qm | Bin 16187 -> 25228 bytes src/gui/res/lang/gui_zh-CN.ts | 1389 ++++++++---------- 3 files changed, 649 insertions(+), 741 deletions(-) create mode 100644 doc/newsfragments/translation_chinese.bugfix diff --git a/doc/newsfragments/translation_chinese.bugfix b/doc/newsfragments/translation_chinese.bugfix new file mode 100644 index 00000000..cab219e0 --- /dev/null +++ b/doc/newsfragments/translation_chinese.bugfix @@ -0,0 +1 @@ +Updated Chinese translation. diff --git a/src/gui/res/lang/gui_zh-CN.qm b/src/gui/res/lang/gui_zh-CN.qm index bc9e5aec97df208ee1f0128855550dbd2d6236d7..21c874e8c284ddafe05592a54bb1540f29dea6d5 100644 GIT binary patch literal 25228 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 delta 4664 zcmai030#!dwLdd_vv2GO2z&xVSY#MLF(6I^6ve>DGJt>z%<=&f#u=Oq0cA8np9GY& zS88HX6S7i`K2y`g<<&fm#FwUteWo?0sm4Z0e_2V?lJ~Sq&o_fa{dIxg%(-*#+0Xx+ zdk4pO$9lc_ht0EoGx5yu`*UW$)jaa+3xxoJ^8lhEfVo$YHUb2UA^mUMrvcJdf$wkm zJb;+30Q!{xq1yoJj{}4$0Nn2&|5Lz!@7s|2wH82_1gV_i;Ce{o^aXE$G)`Yg1bEXpg~Co) z_8uOjoQ7rJbYox%_+%prig-tl-v;1+!#f-ME&%Tm?{-`$K)j0|)vyEL!B_cB zad;jX$!EVp!>POZZP7~rBn$a_58uF2yv*OPd>df)9R7jsivZ$A{?XB$7`T`5FG7m= z$BSYC(!=;C-DqG|1OHv`Fo5(p|4c3ekbQyw*YQLYR0L2@qG9=&fQ8F9A{5R9EPojl z#XlIZ=28S^>WzR6{5=3szX~|Xl~Oi~5+42#Gqj9Kk1avH$EX7H^8lL9s2b)e0B`K; zRJ}V71-mF~6DpFmP>-jcLh$LS-PQvbv5gv?`~o212(|BN#ESNHq^Lmq7wVw&1Ayc> z>X#=m@}LIlR2~|NzU-%oLh8ySIwE_G`r?cfAmcge`@{yMA5oL9VSs{HsK5PY1$cp; zEr_pNfg2AC(k)o~tZ2b|i_M6E{}TMkih}f*;Pah*Si=QEl^FTLpAo8(rvP%c2xIfG zwvoq#$qE~mWQ}m12Ic155-zUp0*I3ed&HL!{g;HBM)snEe-LiZH=*NU!e?@Hs3$_W zXU8cof}mdbK`a^$85Mr90zK9;!mqwW8uYyI>(6&1*eXQACs9B#AQEl8jU~7$lD?3Q z{NIS$IY$#Vh`LNC02Z7VJvtGKj-C-cegYk)UKRc7B6b1wz34oZg{5T0F_()F19jq! z#aP-@vv|`%Qfe!4ItPpdV zVkGU835fP^iRVBscF)6-{u_+|s{K;wqBwxS4r$0v#6()RwBmWRla?tpPh$5(x}**U z^~ejPz25m)v(&GoWEdHeN~ACKu0u3uNyjq^FrqkFaa0O|CR%1VdH`#eB-`-mA2G!O z+2H(Y?BmyDgT><*(bImaj*#uS)quZ0lpT;BMu*E}mmXe*D1TO7Rf`6}=BI(he!5_< z+*|$F6>PJY<+Z<_hpB3l@8+Qa___R*4XJ4G5&1qo)=d4F{20%PHT%#{vj*j-OjwGv zQ}T<&FCtcM$S2NXje|c`2pZ8*{sBeCcFb5zh+G`!u)X%V&aIRyZvK4&s6kR zU}m!3@+wZg%wnWHic9O!fh3tS;yFxVcAat&zaLBUl2Ug?iu>o3U1u@HS>G#Px_TVj zOQwn|!NCJ*DteT`J|9$NjAMks;i?7Wk!Wa*syzlvmvU3p9`^!*(4)FwKsn*Ns;jR) zj-xo&0+3r003r-}y=~QQq86!z5M1eGc93<;W|3HV66u!PsBNW89{E~cAm$c7Df8OM ze8rm~!6peKV}MB=)~w5^R<`yw0r{(9gP1*19aJSU8A+FNi(izlDj*wG{}~X-j2%i3 ztmCNyhe##c@y)Qt(>HLvMM?e~v>}x8h7bKjjM0D)KZ2yCW{ZpbIV?1kV*i7gyz8LY zVr97l0oACf`UROCk|3a(p#D9QsSYL0A%Oy_Vs*QbYz#>Vr@D9PFVBdIl2%%5W_u?m z?0ppSp#yZyqwS`Z$>m;mvZoIU!2k~Yw*U(c$MV*>trF(xq0{Unvvo?|Dq#;gmIIA) zM$my8GI5pRThsapX54pT!0$HHz(NZwf_UW0!fzcT8`|jOHh@mc=T=_M_>5=v{0?2c z-R+<~tix%s+h}_WU1)GPEUbgJIBC1v#qF34E>=U=PP612b?VIg45NBC1Ks9eTNcHuv*L9av(0KZnDa9XI!%5?hfW0Ka#%1=iB*mei>57cX(77s zFj5h^jqDHm%v*hLLJX?<@ZSGvHxB)7Tj`Yi38=imTwc$^fH4)mpo|!}&X*pf13$Em zcgnENH`wu}kC?6fmj^y?9@Fw?Vs5z;po?{^wb(E=Gwrsq>pNHzF0Ebk(oT!3jW*b5 zcD=<#o9t$mOM*I6lW%nBxKD+ZH8@$?$zsH9EN!*7a+&JDWVP5Gw3&5bKAa>oI&5jw zy^+*j8jidZ$&5cU3BSvq84nx|yTg~Cq3{M098s?1x`4xFwPIJJ^$)}zv4~<6n{JVV z5tT$WJCCO&i(|Bh95Io+LvP29^ChL_&DIfwQyy6y7b+h(?zM59qn~gmld(A`LPEKo zyVprF57F2$5*{SwNlKzgj1^E^DM)?d1K1EdQQ!8& z6q(e|2PIHJ-cC#>u_;O-R3qdA3MjR= z5{~cnq%ARG4h7XgtNu1~EUj|e=#`dkgTstmk+Chht~|#Z&Ab@~xjv~4VXAi-TyCdN z(P8vz_<^{L@(Zi#xP(?|>7*I7vzG@NWuJSX%-)X-_> zMdqiznRN4kedM#H(PUv#7>P?sC5Kb?l52IEpuh^NyVYXzyH;UnWyzYCM7M3G z59iYB+!mM1Vr$hL(x)l;0&4Bes^^F;UCWb_k@V{Vs*3)ZnLMv~RUn1}u#%dLoM3JN zu9++Z6j;fo>_jq+vl%z`Q zt!&F@(v9Jp1f2YutG#DdCj0k1eH^E!ubjJ@uI62fpgHMwvq`e^K$Vu$$)pc`vaOW- z-$L}4yJyHF`TkgH7bQ=}a%GXmAIqUQT@X(u?I~&6Qmyn|Wb+?-NTt;Ow(=&IQ0VaO zZG7k?zY<}*xYzsp=27nU?B9$Tx8lcxOfIDKz0j(Tn2H1G(8uLbl?4Nb?>ig3Pu4v2 zNw|{lxu?&{}D`)RQ__+cHOLy7bw9`Gk=rq_|+$F-4Lz*=_05YHIG%qoJ4je425Iw%hP3v9$OCaIolE7j0wF zw9Br+XAda#tgl0zOMFIo0k{`DaEkeXyBZTz_i6hF66EOOk|@euy307zX|kjeF5DJ_ ziOnPbTNp!n3f!|RJawU2b*e$ zVM#hET>2roUYuo&8u)>GH#LuX`kpw@^BOm$s|Q!Tvz~WXvC^k6MV9k`3)(@mYw;eW z4Q8_gQ|(K1hr#LWv^&hc49GA8?vClfJ!e_JmzR1kHaWDGHxKo+_M$}uQPrMGYg;KJ zt&h@wH!#w(t2K{#c=&qdI%Z#av#0M_x(zXjFT3+o@>P#jmTk{%^e~}K!0K#IaPI{z zzr0!hW&h^YLXLAvY!dCNB^i zr{tA4h9f!sAmv^!Gj&PCE6!r0TQFg)d9Ls6!QK3{-DGk*9IRO*m8vs25J* + + + AboutDialogBase - + About Barrier - 关于Barrier + 关于 Barrier - - + + + + Unknown + 未知 + + + + Version: + 版本： + + + + &Ok + 确定(&O) + + + <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> +Copyright © 2018 Debauchee Open Source Group<br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> Barrier is released under the GNU General Public License (GPLv2).<br /><br /> Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br /> -Visit our website for help and info (symless.com). +The Barrier GUI is based on QSynergy by Volker Lanz. </p> - <p> -Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> + <p> +共享键盘和鼠标，跨平台并开源。<br /><br /> +Copyright © 2018 Debauchee Open Source Group<br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Barrier is released under the GNU General Public License (GPLv2).<br /><br /> -Barrier is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Barrier GUI is based on QSynergy by Volker Lanz.<br /><br /> -Visit our website for help and info (symless.com). -</p> - +Barrier 适用 GNU 通用公共许可证（GPLv2）。<br /><br /> +Barrier 基于 Richard Lee 和 Adam Feder 制作的 CosmoSynergy .<br /> +Barrier GUI 基于 Volker Lanz 制作的 QSynergy. +</p> - - Unknown - 未知 - - - - Version: - 版本： - - - - &Ok - 确定 + + Build Date: + 日期： ActionDialogBase - + Configure Action - 行为配置 + 配置动作 - + Choose the action to perform - 选择要执行的行为 + 选择要执行的动作 - + Press a hotkey - 按下热键 + 按下热键 - + Release a hotkey - 松开热键 + 松开热键 - + Press and release a hotkey - 按下一个键然后松开 + 单击热键 - + only on these screens - 仅仅在这些屏幕上 + 仅在这些屏幕上 - + Switch to screen - 切换到屏幕 + 切换到屏幕 - + Switch in direction - 方向切换 + 切换方向 - + left - 左 + 左 - + right - 右侧 + 右侧 - + up - 上方 + 上方 - + down - 下方 + 下方 - + Lock cursor to screen - 锁定指针于屏幕 + 锁定指针于屏幕 - + toggle - 切换 + 切换 - + on - 启用 + 启用 - + off - 禁用 + 禁用 - + This action is performed when - 当……时启用此行为 + 当……时启用此动作 - + the hotkey is pressed - 热键被按下 + 热键被按下 - + the hotkey is released - 热键被松开 + 热键被松开 + + + + Toggle screen + 切换屏幕 AddClientDialog - + Dialog - + TextLabel - + Ignore auto connect clients - + 忽略自动连接的客户端 HotkeyDialogBase - + Hotkey - 热键 + 热键 - + Enter the specification for the hotkey: - 输入热键的说明： + 指定热键： + + + + LogWindowBase + + + Log - Barrier + 日志 - Barrier + + + + &Clear Log + 清空(&C) + + + + &Hide + 隐藏(&H) MainWindow - + &Start - 开始 + 开始(&S) - - &File - 文件 - - - - &Edit - 编辑 - - - - &Window - 窗口 - - - + &Help - 帮助 + 帮助(&S) - - <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> - <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>您正在使用的Barrier版本有些过时了，有新版 <b>%1</b> 可以 <a href="%2">下载</a>。</p> - - - + Program can not be started - 程序无法启动 + 程序无法启动 - + The executable<br><br>%1<br><br>could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program. - 可执行程序<br><br>%1<br><br>没有成功运行，虽然程序本身存在。请检查你是否有运行此程序的权限。 + 可执行程序<br><br>%1<br><br>没有成功运行，虽然程序本身存在。请检查你是否有运行此程序的权限。 - + Barrier client not found - 未找到Barrier客户端 + 未找到Barrier客户端 - + The executable for the barrier client does not exist. - Barrier客户端的可执行程序不存在。 + Barrier客户端的可执行程序不存在。 - + Hostname is empty - 主机名为空 + 主机名为空 - + Please fill in a hostname for the barrier client to connect to. - 请为Barrier客户端设置一个用于连接的主机名 + 请为Barrier客户端设置一个用于连接的主机名。 - + Cannot write configuration file - 不能写入配置文件 + 不能写入配置文件 - + The temporary configuration file required to start barrier can not be written. - 启动Barrier所需的临时配置文件不可写。 + 启动Barrier所需的临时配置文件不可写。 - + Configuration filename invalid - 配置文件名非法 + 无效配置文件名 - + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - 你没有为Barrier服务端设置一个可用的配置文件。需要现在浏览配置文件吗？ + Barrier服务端缺少有效的配置文件。需要现在浏览配置文件吗？ - + Barrier server not found - 未找到Barrier服务端 + 未找到Barrier服务端 - + The executable for the barrier server does not exist. - Barrier服务端可执行程序不存在。 + Barrier服务端可执行程序不存在。 - - Barrier terminated with an error - Barrier因错终止运行 - - - - Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Barrier意外终止运行，退出代码 %1。<br><br>请查看输出日志了解详情。 - - - + &Stop - 停止 + 停止(&S) - + Please add the server (%1) to the grid. - + 请添加服务端（%1）到网格。 - + Please drag the new client screen (%1) to the desired position on the grid. - + 请将新屏幕（%1）拖动到网格中的合适位置。 - + Failed to detect system architecture. - + 检测系统架构失败 - + Cancel - + 取消 - + Failed to download Bonjour installer to location: %1 - + 无法下载Bonjou安装包至 %1 - + Do you want to enable auto config and install Bonjour? This feature helps you establish the connection. - + 是否开启自动配置并下载Bonjour？ + +此功能帮助你建立连接。 - + Auto config feature requires Bonjour. Do you want to install Bonjour? - + 自动配置需要Bonjour + +是否安装Bonjour？ - + Barrier is starting. - Barrier正在启动 + Barrier正在启动 - + Barrier is running. - Barrier正在运行 + Barrier正在运行 - + Barrier is not running. - Barrier没有运行 + Barrier没有运行 - + Unknown - 未知 + 未知 - - - + + + Barrier - Barrier + Barrier - + Browse for a barriers config file - 浏览Barrier配置文件 + 浏览Barrier配置文件 - - Barrier is now connected, You can close the config window. Barrier will remain connected in the background. - - - - + Security question - + 安全确认 - + Do you trust this fingerprint? %1 -This is a server fingerprint. You should compare this fingerprint to the one on your server's screen. If the two don't match exactly, then it's probably not the server you're expecting (it could be a malicious user). +This is a server fingerprint. You should compare this fingerprint to the one on your server's screen. If the two don't match exactly, then it's probably not the server you're expecting (it could be a malicious user). To automatically trust this fingerprint for future connections, click Yes. To reject this fingerprint and disconnect from the server, click No. - + 是否信任此指纹？ + +%1 + +这是服务端的指纹，请将其与你服务端屏幕的指纹进行对比。如果两者不一致，你可能没有连接到预期的服务端，或是遇到了恶意攻击。 + +点击确认以自动信任此指纹在未来的连接，点击停止来中断连接。 - + Save configuration as... - 保存配置到文件 + 保存配置到文件 - + Save failed - 保存失败 + 保存失败 - + Could not save configuration to file. - 不能保存配置到文件 + 无法保存配置到文件 + + + + &Barrier + &Barrier + + + + Barrier is now connected. You can close the config window and Barrier will remain connected in the background. + Barrier已连接。现在可以关闭窗口，Barrier会在后台保持连接。 MainWindowBase - + Barrier - Barrier + Barrier - - Ser&ver (share this computer's mouse and keyboard): - + + Ser&ver (share this computer's mouse and keyboard): + 服务端 - 共享此电脑的鼠标和键盘 - + Screen name: - 屏幕名： + 屏幕名： - + &Server IP: - 服务端IP + 服务端IP： - - + + &Start - 开始 + 开始(&S) - + Use existing configuration: - 使用已有的配置： + 使用已有的配置： - + &Configuration file: - 配置文件： + 配置文件： - + &Browse... - 浏览… + 浏览(&B)… - + Configure interactively: - 交互配置： + 交互配置： - + &Configure Server... - 设置服务端… + 设置服务端(&C)… - + Ready - 准备完毕 + 准备完毕 - - Log - 日志 - - - + &Reload - 应用 + 应用(&R) - + IP addresses: - IP地址 + IP地址： - - Fingerprint: - + + &Client (use another computer's mouse and keyboard): + 客户端 - 使用另一电脑的鼠标和键盘 - - &Client (use another computer's mouse and keyboard): - - - - + Auto config - + 自动配置 - + &About Barrier... - 关于Barrier… + 关于Barrier(&A)… - + &Quit - 退出 + 退出(&Q) - + Quit - 退出 + 退出 - + Run - 运行 + 运行 - + S&top - 停止 + 停止(&t) - + Stop - 停止 + 停止 - - S&how Status - 显示状态 - - - + &Hide - 隐藏 + 隐藏(&H) - + Hide - 隐藏 + 隐藏 - + &Show - 显示 + 显示(&S) - + Show - 显示 + 显示 - - Save configuration &as... - 保存配置到… - - - + Save the interactively generated server configuration to a file. - 保存通过交互配置生成的配置到文件。 + 保存交互生成的配置到文件。 - - Settings - 设置 - - - + Edit settings - 编辑设置 + 编辑设置 - - Run Wizard - 运行向导 + + SSL Fingerprint: + SSL指纹： + + + + S&ave configuration + 保存配置(&a) + + + + Change &Settings + 更改设置(&S) + + + + Show &Log + 显示日志(&L) + + + + Show Log + 显示日志 NewScreenWidget - + Unnamed - 未命名 - - - - PluginManager - - - Failed to get plugin directory. - - - - - Failed to get profile directory. - - - - - Failed to download plugin '%1' to: %2 -%3 - - - - - Could not get Windows architecture type. - - - - - Could not get Linux architecture type. - - - - - PluginWizardPage - - - Setup Barrier - 设置Barrier - - - - Please wait... - - - - - Error: %1 - - - - - - Setup complete. - - - - - Downloading '%1' plugin (%2/%3)... - - - - - Plugins installed successfully. - - - - - Generating SSL certificate... - - - - - Downloading plugin: %1 (1/%2) - - - - - Getting plugin list... - + 未命名 QObject - + All files (*.*) - 所有文件 (*.*) + 所有文件 (*.*) - + Barrier Configurations (*.sgc) - Barrier配置文件(*.sgc) + Barrier配置文件 (*.sgc) - + Barrier Configurations (*.conf) - Barrier配置文件(*.conf) - - - - System tray is unavailable, quitting. - 系统托盘不可用，程序退出。 + Barrier配置文件 (*.conf) ScreenSettingsDialog - + Screen name is empty - 屏幕名为空 + 屏幕名为空 - + The screen name cannot be empty. Please either fill in a name or cancel the dialog. - 屏幕名不能为空。请填入一个名字或者关闭对话框。 + 屏幕名不能为空。请填入一个名字或者关闭对话框。 - + Screen name matches alias - 屏幕名对应别名 + 屏幕名对应别名 - + The screen name cannot be the same as an alias. Please either remove the alias or change the screen name. - 屏幕名不能与别名相同，请取消或者更改别名。 + 屏幕名不能与别名相同，请取消或者更改别名。 ScreenSettingsDialogBase - + Screen Settings - 屏幕设置 + 屏幕设置 - + Screen &name: - 屏幕名： + 屏幕名： - + A&liases - 别名 + 别名 - + &Add - 添加 + 添加(&A) - + &Remove - 删除 + 删除(&R) - + &Modifier keys - 修改按键 + 修改按键 - + &Shift: - Shift: + Shift: - - - - - + + + + + Shift - Shift + Shift - - - - - + + + + + Ctrl - Ctrl + Ctrl - - - - - + + + + + Alt - Alt + Alt - - - - - + + + + + Meta - Meta + Meta - - - - - + + + + + Super - 超级 + 超级 - - - - - + + + + + None - 无 + 无 - + &Ctrl: - Ctrl： + &Ctrl： - + Al&t: - Alt： + Al&t： - + M&eta: - Meta： + M&eta： - + S&uper: - Super： + S&uper： - + &Dead corners - 死角 + 死角 - + Top-left - 左上角 + 左上角 - + Top-right - 右上角 + 右上角 - + Bottom-left - 左下角 + 左下角 - + Bottom-right - 右下角 + 右下角 - + Corner Si&ze: - 死角大小 + 死角大小 - + &Fixes - 修改 + 修改 - + Fix CAPS LOCK key - 修复caps lock键 + 修复caps lock键 - + Fix NUM LOCK key - 修复num lock键 + 修复num lock键 - + Fix SCROLL LOCK key - 修复scroll lock键 + 修复scroll lock键 - + Fix XTest for Xinerama - 修复Xinerama的XTest + 修复Xinerama的XTest + + + + Fix Preserve Focus + 修复焦点 ScreenSetupModel - + <center>Screen: <b>%1</b></center><br>Double click to edit settings<br>Drag screen to the trashcan to remove it - <center>屏幕设置: <b>%1</b></center><br>双击以修改设置<br>将屏幕拖到废纸篓来移除 + <center>屏幕设置: <b>%1</b></center><br>双击以修改设置<br>将屏幕拖到废纸篓来移除 + + + + ScreenSetupView + + + Unnamed + 未命名 ServerConfigDialog - + Configure server - + 设置服务端 ServerConfigDialogBase - + Server Configuration - 服务端配置 + 服务端配置 - + Screens and links - 屏幕和联接 + 屏幕和联接 - + Drag a screen from the grid to the trashcan to remove it. - 从格子中拖动屏幕到垃圾桶进行删除。 + 从网格中拖动屏幕到垃圾桶进行删除。 - + Configure the layout of your barrier server configuration. - 设置Barrier服务端配置的屏幕布局。 + 配置Barrier服务端的屏幕布局。 - + Drag this button to the grid to add a new screen. - 拖动此按钮到格子中进行添加屏幕。 + 拖动此按钮到网格以添加屏幕。 - + Drag new screens to the grid or move existing ones around. Drag a screen to the trashcan to delete it. Double click on a screen to edit its settings. - 拖动屏幕（图标）到网格中或者移动已经在网格中的屏幕的位置。 + 拖动屏幕图标到网格，或者移动已经在网格中的屏幕。 拖动屏幕到垃圾桶进行删除。 双击屏幕编辑其设置。 - + Hotkeys - 热键 + 热键 - + &Hotkeys - 热键 + 热键(&H) - + &New - 新建 + 新建(&N) - + &Edit - 编辑 + 编辑(&E) - + &Remove - 删除 + 删除(&R) - + A&ctions - 行为 + 动作 - + Ne&w - 新建 + 新建(&w) - + E&dit - 编辑 + 编辑(&d) - + Re&move - 删除 + 删除(&m) - + Advanced server settings - 服务端高级设置 + 服务端高级设置 - + &Switch - 切换 + 触边切换 - + Switch &after waiting - 等待后切换 + 延时 - - - + + + ms - 毫秒 + 毫秒 - + Switch on double &tap within - 双击tap切换 + 二次触边 - + &Options - 选项 + 选项 - + &Check clients every - 客户端检查周期 + 客户端检查周期 - + Use &relative mouse moves - 使用相关的鼠标动作 + 使用相对的鼠标动作 - + S&ynchronize screen savers - 同步屏幕保护 + 同步屏幕保护 - - Don't take &foreground window on Windows servers - 不要移动前台窗口在Windows服务器上 + + Don't take &foreground window on Windows servers + 不要在Windows服务端获取前台窗口 - + Ignore auto config clients - + 忽略自动配置的客户端 - + &Dead corners - 死角 + 死角 - + To&p-left - 左上角 + 左上角 - + Top-rig&ht - 右上角 + 右上角 - + &Bottom-left - 左下角 + 左下角 - + Bottom-ri&ght - 右下角 + 右下角 - + Cor&ner Size: - 死角大小 + 死角大小 + + + + Bump against the screen edge with the mouse pointer twice in quick succession. + 要触发二次触边，快速并连续地滑动指针到屏幕边缘。 + + + + Enable drag and drop file transfers + 启用拖放文件传输 + + + + Enable clipboard sharing + 启用剪切板共享 SettingsDialog - + Save log file to... - 保存日志文件… - - - - Elevate Barrier - 评价Barrier - - - - Are you sure you want to elevate Barrier? - -This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. - 您确定要elevate Barrier吗？ -这会允许Barrier和elevated进程交互和UAC对话框，但是可能引起一切和非elevated进程交互的问题。只有在你需要的时候才Elevate Barrier。 + 保存日志文件… SettingsDialogBase - + Settings - 设置 + 设置 - + Sc&reen name: - 屏幕名称: + 屏幕名称: - + P&ort: - 端口： + 端口： - - &Interface: - 界面 - - - - Elevate mode - - - - + &Hide on startup - + 最小化启动 - - &Network Security - - - - - Use &SSL encryption (unique certificate) - - - - + Logging - 日志记录 + 日志 - + &Logging level: - 日志等级 + 日志等级 - + Log to file: - 记录到文件 + 记录到文件 - + Browse... - 浏览… + 浏览… - + Error - 错误 + 错误 - + &Language: - 语言： + 语言： - - &Miscellaneous - 其他 - - - + Warning - 警告 + 警告 - + Note - 注意 + 注意 - + Info - 信息 + 信息 - + Debug - 调试 + 调试 - + Debug1 - 调试1 + 调试1 - + Debug2 - 调试2 + 调试2 + + + + General + 通用 + + + + Elevate + 提权 + + + + Specify when the Barrier service should run at an elevated privilege level + 设置Barrier服务何时应该提权运行 + + + + As Needed + 按需 + + + + Always + 总是 + + + + Never + 从不 + + + + Minimize to System &Tray + 最小化到系统托盘 + + + + Start &Barrier on startup + 自动启动 + + + + Networking + 网络 + + + + &Address: + 地址： + + + + Enable &SSL + 开启SSL SetupWizard - + Setup Barrier - 设置Barrier + 设置Barrier - + Please select an option. - 请选择一个选项 - - - - Please enter your email address and password. - 请输入您的邮箱地址和密码。 + 请选择一个选项 SetupWizardBase - + Setup Barrier - 设置Barrier + 设置Barrier - + Welcome - 欢迎 + 欢迎 - + Thanks for installing Barrier! - 感谢您安装Barrier！ + 感谢您安装Barrier！ - - Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). - Barrier允许你轻松地在你办公桌上多台计算机之间共享你的鼠标和键盘，它免费并且开放源代码。你只要将鼠标（指针）从一台计算机的屏幕边缘移出到另一个屏幕就行了。甚至可以共享你的剪贴板。你所需要的仅仅是一个网络连接。Barrier是跨平台的（可以运行于Windows，Mac OS X和Linux）。 + + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier可以在多台计算机间轻松共享你的鼠标和键盘，它还是自由开源软件。将鼠标指针从计算机的屏幕边缘移出到另一个屏幕，并同时共享剪贴板，只要你有一个网络连接。Barrier是跨平台的（可以运行于Windows，Mac OS X和Linux）。 - - Activate - + + &Server (share this computer's mouse and keyboard) + 服务端 - 共享此电脑的鼠标和键盘 - - &Activate now... - - - - - Email: - - - - - Password: - - - - - <a href="https://symless.com/account/reset/">Forgot password</a> - - - - - &Skip activation - - - - - &Server (share this computer's mouse and keyboard) - - - - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</span></p></body></html> - +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">这台电脑连接了鼠标和键盘，需要共享给其他电脑。一套配置只能有一个服务端。</span></p></body></html> - - &Client (use another computer's mouse and keyboard) - + + &Client (use another computer's mouse and keyboard) + 客户端 - 使用另一电脑的鼠标和键盘 - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</span></p></body></html> - +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">已经配置了服务端，此电脑将由服务端的鼠标和键盘进行控制。可以配置多个客户端。</span></p></body></html> - + Server or Client? - （此计算机作为）服务端还是客户端？ + 服务端还是客户端？ SslCertificate - + Failed to get profile directory. - + 获取配置目录失败。 - + SSL certificate generated. - + SSL证书已生成。 - + SSL fingerprint generated. - + SSL指纹已生成。 - + Failed to find SSL fingerprint. - + 无法找到SSL指纹。 + + + + Could not read from default certificate file. + 无法读取默认证书文件。 + + + + Error loading default certificate file to memory. + 读取默认证书文件失败。 + + + + Default certificate key file does not contain valid public key + 默认证书文件没有有效的公钥 + + + + Public key in default certificate key file is not RSA or DSA + 默认证书文件的公钥不是RSA或DSA + + + + Public key in default certificate key file is too small. + 默认证书文件位数不足。 VersionChecker - + Unknown - 未知 - - - - WebClient - - - An error occurred while trying to sign in. Please contact the helpdesk, and provide the following details. - -%1 - - - - - Login failed, invalid email or password. - 登录失败，邮箱地址或密码错误。 - - - - Login failed, an error occurred. - -%1 - 登录失败，出错了。 -%1 - - - - Login failed, an error occurred. - -Server response: - -%1 - 登录失败，出错了。 -服务器回应： -%1 - - - - An error occurred while trying to query the plugin list. Please contact the help desk, and provide the following details. - -%1 - - - - - Get plugin list failed, invalid user email or password. - - - - - Get plugin list failed, an error occurred. - -%1 - - - - - Get plugin list failed, an error occurred. - -Server response: - -%1 - + 未知 ZeroconfService - + zeroconf server detected: %1 - + 检测到zeroconf服务端：%1 - + zeroconf client detected: %1 - + 检测到zeroconf客户端：%1 - - + + Zero configuration service - + zeroconf服务 - + Error code: %1. - + 错误代码：%1。 - + Unable to start the zeroconf: %1. - + 无法启动zeroconf：%1。 - + Barrier - Barrier + Barrier - + Failed to get local IP address. Please manually type in server address on your clients - + 无法获取本地IP地址。请在客户端上手动输入服务端地址。 - - + + %1 - + %1 - \ No newline at end of file + From 00cfe0ba6d426a293483a488f55af8ce760c9ef9 Mon Sep 17 00:00:00 2001 From: HwiNyeon Kim Date: Tue, 30 Mar 2021 18:23:48 +0900 Subject: [PATCH 11/12] Missed Korean translation part edited Some parts that still written as "Synergy" in Korean installation process edited to "Barrier." --- src/gui/res/lang/gui_ko.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/res/lang/gui_ko.ts b/src/gui/res/lang/gui_ko.ts index fed2a484..46f7223b 100644 --- a/src/gui/res/lang/gui_ko.ts +++ b/src/gui/res/lang/gui_ko.ts @@ -204,7 +204,7 @@ Visit our website for help and info (symless.com). <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>사용 중인 시너지는 최신 버전이 아닙니다. 새 버전(<b>%1</b>)을 <a href="%2">다운로드</a> 받을 수 있습니다.</p> + <p>사용 중인 배리어는 최신 버전이 아닙니다. 새 버전(<b>%1</b>)을 <a href="%2">다운로드</a> 받을 수 있습니다.</p> @@ -600,7 +600,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re Setup Barrier - 시너지 설정 + 배리어 설정 @@ -1176,7 +1176,7 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but Setup Barrier - 시너지 설정 + 배리어 설정 @@ -1194,7 +1194,7 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but Setup Barrier - 시너지 설정 + 배리어 설정 @@ -1204,7 +1204,7 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but Thanks for installing Barrier! - 시너지를 설치하여 주셔서 감사합니다. + 배리어를 설치하여 주셔서 감사합니다. From f52690af82e088ac7825c10c54e20e11779ba1bc Mon Sep 17 00:00:00 2001 From: terminator-ger Date: Sat, 17 Apr 2021 12:22:11 +0200 Subject: [PATCH 12/12] README: Add two Questions to the Q&A regarding configuration loading --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 9a034e65..3d996fe5 100644 --- a/README.md +++ b/README.md @@ -86,3 +86,14 @@ A: Q: Are 32-bit versions of Windows supported? A: No + +Q: How do I load my configuration on startup? + +A: Start the binary with the argument `--config ` + +Q: After loading my configuration on the client the field 'Server IP' is still empty! + +A: Edit your configuration to include the servers ip adress manually with + (...) + section: options + serverhostname=