From 2cfe92de85aa966ad30be9dab0538ed6c11a2dff Mon Sep 17 00:00:00 2001 From: CHARRAS Date: Thu, 20 Sep 2007 05:41:40 +0000 Subject: [PATCH] hotkey enhancement --- change_log.txt | 2 +- common/hotkeys_basic.cpp | 44 +++ eeschema/eeconfig.cpp | 13 +- gerbview/gerbview_config.cpp | 13 +- include/hotkeys_basic.h | 3 +- internat/fr/kicad.mo | Bin 131964 -> 132801 bytes internat/fr/kicad.po | 554 ++++++++++++++++++----------------- pcbnew/pcbcfg.cpp | 7 +- 8 files changed, 335 insertions(+), 301 deletions(-) diff --git a/change_log.txt b/change_log.txt index cb0da2f0e2..c57e25d850 100644 --- a/change_log.txt +++ b/change_log.txt @@ -4,7 +4,7 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with email address. -2007-sept-19 UPDATE Jean-Pierre Charras +2007-sept-20 UPDATE Jean-Pierre Charras ================================================================================ + all * hotkeys handling finished diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp index d8130d8d34..ab6f1789e1 100644 --- a/common/hotkeys_basic.cpp +++ b/common/hotkeys_basic.cpp @@ -639,4 +639,48 @@ void AddHotheyConfigMenu( wxMenu* menu ) _( "Hotkey config location" ), _( "Hotkey config file location selection (home directory or kicad tree)" ), right_xpm ); + submenu_hkcfg->Check(ID_PREFERENCES_HOTKEY_PATH_IS_HOME, + g_ConfigFileLocationChoice == 0); + submenu_hkcfg->Check(ID_PREFERENCES_HOTKEY_PATH_IS_KICAD, + g_ConfigFileLocationChoice == 1); } + + +/************************************************************************/ +void HandleHotheyConfigMenuSelection( WinEDA_DrawFrame * frame, int id ) +/************************************************************************/ +/* called on hotkey file location selecton menu +* @param frame = current WinEDA_DrawFrame +* @param id = selected menu id +* @return g_ConfigFileLocationChoice (global) = new selection +*/ +{ +wxMenuBar * menu = frame->GetMenuBar(); + + switch (id ) + { + case ID_PREFERENCES_HOTKEY_PATH_IS_HOME: + if ( g_ConfigFileLocationChoice != 0 ) + { + g_ConfigFileLocationChoice = 0; + menu->Check(ID_PREFERENCES_HOTKEY_PATH_IS_HOME, true); + menu->Check(ID_PREFERENCES_HOTKEY_PATH_IS_KICAD, false); + frame->m_Parent->m_EDA_CommonConfig->Write(HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice); + } + break; + + case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD: + if ( g_ConfigFileLocationChoice != 1 ) + { + g_ConfigFileLocationChoice = 1; + menu->Check(ID_PREFERENCES_HOTKEY_PATH_IS_HOME, false); + menu->Check(ID_PREFERENCES_HOTKEY_PATH_IS_KICAD, true); + frame->m_Parent->m_EDA_CommonConfig->Write(HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice); + } + break; + + default: + break; + } +} + diff --git a/eeschema/eeconfig.cpp b/eeschema/eeconfig.cpp index 98272161bd..f1e566554f 100644 --- a/eeschema/eeconfig.cpp +++ b/eeschema/eeconfig.cpp @@ -99,19 +99,8 @@ wxString FullFileName; } case ID_PREFERENCES_HOTKEY_PATH_IS_HOME: - if ( g_ConfigFileLocationChoice != 0 ) - { - g_ConfigFileLocationChoice = 0; - m_Parent->m_EDA_CommonConfig->Write(HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice); - } - break; - case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD: - if ( g_ConfigFileLocationChoice != 1 ) - { - g_ConfigFileLocationChoice = 1; - m_Parent->m_EDA_CommonConfig->Write(HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice); - } + HandleHotheyConfigMenuSelection( this, id ); break; default: diff --git a/gerbview/gerbview_config.cpp b/gerbview/gerbview_config.cpp index 946848e228..af736f2bf7 100644 --- a/gerbview/gerbview_config.cpp +++ b/gerbview/gerbview_config.cpp @@ -68,19 +68,8 @@ void WinEDA_GerberFrame::Process_Config( wxCommandEvent& event ) break; case ID_PREFERENCES_HOTKEY_PATH_IS_HOME: - if( g_ConfigFileLocationChoice != 0 ) - { - g_ConfigFileLocationChoice = 0; - m_Parent->m_EDA_CommonConfig->Write( HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice ); - } - break; - case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD: - if( g_ConfigFileLocationChoice != 1 ) - { - g_ConfigFileLocationChoice = 1; - m_Parent->m_EDA_CommonConfig->Write( HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice ); - } + HandleHotheyConfigMenuSelection( this, id ); break; default: diff --git a/include/hotkeys_basic.h b/include/hotkeys_basic.h index 45e3817a7c..73ef076852 100644 --- a/include/hotkeys_basic.h +++ b/include/hotkeys_basic.h @@ -91,7 +91,8 @@ COMMON_GLOBL int g_ConfigFileLocationChoice; /* 0 = files are in Home directo /* Functions: */ wxString ReturnHotkeyConfigFilePath( int choice ); -void AddHotheyConfigMenu( wxMenu* menu ); +void AddHotheyConfigMenu( wxMenu* menu ); +void HandleHotheyConfigMenuSelection( WinEDA_DrawFrame * frame, int id ); wxString ReturnKeyNameFromKeyCode( int keycode ); wxString ReturnKeyNameFromCommandId( Ki_HotkeyInfo** List, int CommandId ); wxString AddHotkeyName( const wxString& text, Ki_HotkeyInfo** List, int CommandId ); diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index c74ad06b76480beae77603b458322c9f43b41ede..eeb06fd0570fec501fb5dba603eaf2de314897ea 100644 GIT binary patch delta 48857 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 delta 48178 zcmZtP2l$QkAMo*GWtY9j&)#Gul#B?GB1&jUMwALg%CN}1~$P)*cXfA zWGtUbrBg3+UYG;L=no9~Q&Yv0|j_V_wqDu@JVy+<0l^_eJKEx<1l3 zVJ_06BR`F&F@EX+ZX94TI>6It$Fs35F2J(*501wo%aZy}p)-CF4fxH-UxPVGe}(q* z9op}9wBA0fhVRHKwifJ_%0go z$LLc3jQ0008d#1MiFq*XfCag6&&r|^w?aGWh?TG>o{hI*2Yd^g;$dut_1;gV&cFd! z6GvisoQdxJGR%%UF$ew{{{BAeZ^mDdaUeV#9t%%~IX*}_$Q|ZKJ3b@QMZywcnXp1w zIjkPm{ve%nP@fE!up!#vxnb+DUDzS)6m~(ks2jS+z0egLfG+h-=%E~euJoN~y@$}P zo1W&z3NN4)=Aa!eLG#~78>~S){ubSuZD{?ykv@inN#|Lal$SxvYhX2OicYW(de#PF zE==FfO$lzsq61DtBYQR~yn=Q-FY;GJ{u(r(&(U_@p=V%gr2j$(I*bmK=fkA@bTqIE z$VAeqy4-j=n`03?AAL+NLuYh#R7jHba-ZJ=$@1bc?P-+ueZH9~tF$MEOK4P5#u#e*^93 z1N5={9CI^%Y6myY=y!C+`_O?;qLCL|ovcVDbPt=O9kfR~>=O<`100F=Ga>SyKqvMh zx+Qbb2`t039jxNUnS2=qo6!!oqXX?jm-w`gl8y?a?MkEh)x(D9jL$(|RK3tMaT7YB zH0HpGm<=EMi1l~iDN*n&x~I>F3&S;NgUy&7e?(`r6?5XRk^cue!@tmhQXeOKofAzL z3=2no@sC-53o1lGWz5V7J%kO>fI6Ww=!*tCBpiWm$yoGIJ%k201r7KKw7;j&6@3wX zlfI3ekFLlO zwBLN6BoiuuPCQ+U8~3sv=EfG0Zi{xc8*iXa)=pdtZ$*ay9}NCI`o115$*C1^qc-IwFK7V!(3nq##Xn0rsuMO1&%*-L>x2f{ z3l02w%#XKWbsUFPaSm3&^`Eg3xwtt%hUfMOdOlO1CjsOPi=qKmM(dr0zVptFbT@P* zd!YebiJ4=I_BRd-;DjijicavQbW~Un6&9l_uo{hgJ-WL;pi8$C&&6ZtJFoc{$(HoM zE~Kx=I=BGsXDhn&zo7vhL^uC9+HX4B`ebJL(50?`&a4UAL5Ik{Bpevt6;8pn)SHbC z^hf0Xg9S+!_%g8!o=&Z+Tb!g0|%f>I1*j@htP;;qBD3E?Pwm> zz_-wTzDKw8H!Otv(EhS*NCGU3POK~z@IkB|8I3a;{0t2*jQq>dt>_>5H%0!PXvY(< zFg}UCOJ}3?SEB)ZiIs6X8hFmHlC8*#1sFe7m>U~ZK$oaCx|Gc$za1KJH}vpbfew5P zx-vJT1C2-9KY`YN8C{{bB7Y&ef~(MeKEuox@z>mVn6^d1(Jwdb)dJ5xf=)<48213Fy{75x#`hfBS3J-vBvelMOtXIlK5 zWY4RkzxXf0qBs;SzZ+el$It+tN58(_!cO=V+HbjytiJ=*-k1!~6kC$+iZ0QEXvIg- zj%K0*y^e0tO016S(1G`(GtcpDGNIyVc_l1{9npIIuom8!=Eg(w6lUQ9tcl-XT|9vf zRQtQ+R5wAt!CRnvc?(*82O8jbbV5_nr(hPk)GwnGdK-NYyo(;j^h$0#ogbqe?FkQr zC&Jv{C*_6Fr7erjv<^DpxoAKg(E%<&SFSfY^MU9YyAvJf38Y;*^&B?_Fc-7%3oM0y zVMENbDZaN|SL5 zx`dCQkfv(U|w4VY$BmtF1189R~eExfL z;}VX*ikL=cItvYG3A(gv(8udbwBsG<3=g3*FaKk5xEiAM+M)yZM9Z&5+l|61_yDHM za5Ik^S6~ggblcHW`Vacp{XLAu@fEC(%h0FbcWi=1 zeo9v8f}dFbOoU`O<7=@w-hr;jB5Z*lU~N2x<+1wKGvkvxWl(LHN~o{8RQy&KV)jgI_>(6cZLJwtDz zfqsex^kbC&j`n{n%(F8SSUOdl8)r}nGfRtBY!m5=&;j~JdMMiQ7<6V2M*g(Oe-W+! zHrmgJXyEJ7!?_uqz#%-t=l`@{l7bRwgNA6wt0UzzSQUPW4zvYx;UAH| zA6@d3k_ofLMIk6?y!Pe-jbSV0KkHQ8x6?5ZibmpI-0dGOy zaC^}iX4{jjU@5d-J#?j8VRc-APWYESRmCsH5tdn(#-Awuxe+^9AK_hNX$8)0KLbRh^SO~8|I~tDG zACEP0GWs|z!9utd4P+mB=#Habw?+O=eg`zbHl(k_^YFR9S^t*YY$L?7($gsgb=x?** z=zzrzB!{XhW|2M{D`M|(G}__xa1PpjDY}(kqd#c2p)aN~2a~hX5Is9*rMYow&qcSO zI~K)j(4`xRcJw&f!K}!CC;U3f_n`xyK8qJOyA3mFO-+j zhO4m{{(!E)K6J*Zf0F#HuqnD?ozW$}7+uLeXut!p297`neg>WKoJh|{9^-WCeQtbw z)}S4Jh7R}@8u@-S;$nxBbak|&j_68tLzlQe7RP7N0T-Yvx)Pnpm*|RaL-+m!=JokM z?cZbuh0s9CViC+j4^3kM(baVuGj$dEQ~={;9<1=Q|QXP5czMQfi1;C zjGtP|jqmUu(8vyjD9J!#dGjVw0s7-74M@fupOQG?nv)N2Rev3@FW^Qj$_FL&cM2) zOQQjFKv(GMW30dL@?lYNBs!CHRGf^}Nzca2bBpfn_V6!sD^6euEP6btR~rqqC7RzB zZPy!Jv4QBy-f`Uh=Vm+^9{GGQg21;|Aq$occiobFL_brMQ2_c z4WJFWQoYfDZ$bk~-^Ps*--BgwDmu_xXrwF9fL5WWc0HECpU@7Dpn>E#nUv>411^oO zKrM8y+oFMV!wNVM=|7#ipBp=P7(E=1qmj--JNgjq;43VTThSSxKm$KLl`Yd@C3Jw+ zXrPy4X0Oo+-4W#vq7!`{8~OY%=jL28_Mws0&z3E7TDziwjls;`g%5|*!dc<$a6z~{ zToY~xe+Yk3#!vkf8Ark#*|TL{I0ezisVHV)Np$bdMrYm{ooNqrhS#DiHXMDA+>LJG zgXlyiMgBB&LNhUK!E4<3hI@Dl#qzFAjT$*P=7OA=0;ocZTD`N#T>>bK&gp?Qm(hI!8L``18ov z82%LgiVnOl{5MSHO!D)Dg~C$kVa-AhSv_<`JE1FdMR*Oml7rIR*kA-Y&^=M`Ai8(c z(7k#Zt@jeTRrAq3UyOG25qefOppV@~bPN7O12~Mf&yy?3FOK$`uE32Q)1ao9pf8*yXkhCjy#+m#2g97FWy?I~#juvoe|>ITs>{(+ zJpw&k6VTH=107%v`g|`$SLQQx<{Qw!wxBcIg-+-|lpjHtK3DD}zX0042n5LowEx_vd3AV<+&=oi{Z_-b5^iA3kUCC?Ffk&Z%O+Z&< z3Z@<4=_q&^UE=xZ5`Bu!{0p?fkLas;2ioBgbmj8pOVTCL6|5OHLML_(dN?mc$Lkhe zk&ox!y&4b|Z$J;*7<2{hjfzvzj%T5P%|>VP270*OLjzokuEYkk{${L*J24A$=1=NZ zL+dro&+~7^R%AGEM>Ksgw!|yYZ@VYZ0p>?~3A(gjqbu?&x)LYQmC08iS-G-dEp+Re zVIAy(PVn}0+&mOMgPED39lnPSum+vUmMA|F<#`Jxft0{afX&eXI-`fOd*t_y{2^%Iw?uj@y7%{^ zhj13!&q7Q)qmQ_0h~Gy+zQW0&DT@wV4}GDuL<8!Hw!03U@oi{8_n<5CAi5%xqI@da zZf2xkkM!cgJpV@YF&Reu1G?0|q66$lBh6JLc?wFP1J*_BorSJgn<(!b4*_a4%+I>0(L5EznnU7qsDZ=s;u9_rrsj={S4` zJ^i1f6WNXium|0medt!D|A~TQ=nS(LPhKQN(V3r#u1qU*=`KM7?vKv=R=gD-Ks!E; zw#!~3TdD^ZLfc)3_CE@3Hv!p_bm|#yoY^e&YjQCf=_Yh9iUY04Dv@4Ic zYl;qh8D`-C%$$03z*$%o7osb;3CsBXe}J31WSm|qnR!ce#+Rd8aszr;ZV&H8m-dnH zIdth4qFb>J9e6wXwS6?wrAsH}jnMiXG4l`NUB!(v9f%G%99@CC&?UPM4QN`VUqfg5 zF1ojC&_lK!-GU#`8E;4X`6oPqK888VBzs>JGk^cT6gO6^h6Yj>eRDNMXVN_KyQ2g4 zLF@NNS7rzr_y}}>dm{f)G?1s!0N+IGEe$^@!}ISc-bhAfuh9_T+F?&wNg8R?;D0Jn$Z%kuo2@pxp+3g@96yc>QLZV0!af$u@v zA4FFsTe;-NY+md@x*8hbQ1mId3#~U94fx44Hy(y((G^&T&R{uuT34fi>_G=Sgm#cB zpVZHTo{hrjKvg5%6b-B+W?tFomR^VcP8fvtmmbfJ13wxW)6wVqCCvQXM!)SoL$~HP zG~k11NBJux0oFu2Y=Q=K9{QMdM*|s(1~M9*-~-4+(y7Uj@g#a!W}*QsNGhaOp#iQ# zSK^y+8#>@0kv@#>b&iV3fQ8ZW3h0@sg$`UFYhlxjJpWg5FA7$paYf+v(RyBpk=EjcRL<9H?jcfxt z@D}v&{f6#!u4>617eMP5Li3A9x*WR4mCyj{U{&md4tygT&}g*(^dxRv!Wrnmb0fVt z(reJ?_-piQb}v@JGpZ-)#^^vj(KB)@W}b6&fCn%$V>GbmFmslY{B-IqZd}@>=!`x^ z-*8``Gy68&g4WxKZqfem7&=hS8rd@6`-RbTBh0*r&{uDFbb{BR6CRF*{Qkc?3LXoe z4QGdo!j<9Y=u9@DGuwd<@F#jUQZ{N3D`{UAZC4dNTkX&QuSO5+E$CK`!_4phm$~u9vjpAS zFVO%FVnZxgJ6q;&v7Cn$NsmVBPY>s#0ep&?#}(azU(kW}M}Dz7Ng&nGr=eM$`1Aio zWVoc4hF79zU{IuohhrlDzVMN7YLq_{=~u!x&_LcnPyH%%WxhvO@NgZTe+!D&O(L(2 zzGzyar}$cQ4{t^T9El#%H2PTHhaS>dXuz+a?cP9FXgRtf8_{~Zum9kRHK} zdp$WaUPDjuD)g{zLYHhWy7vVdBzspETaa#t^>8e@Li5m>zk^QXi^%^Sef$nZI@_6< zKj`q!eDJKGxTu z6C8pDb~k3e|0hPltZ)(9;X2G59(2!kh5up}>3ofo!0Vv(TB9?(1U-b;p#2O-S7uB& z5v}(erfv8ZH%7J+U8?WU2!Dz6el&nolcd8UXu2G_a`n*x+M!$3E4&d6Z=zdOy1 zGrd1D9!2-&33SO`iSqg3(kTB3o!LgTOGR9PO_>TCZN%3fi1g5?FcN(n??snx7FzEmwB6juUx;quyJ*LousQBR1Is!)*^(ycR&+q#to-#q zZj7u~6bwXPNVlQ`Jc6#!G_<2xXdnyFrCow{xFTGO&iGsOEbKy8>QI=cc@jujEbjAP zj~gRyhjw&v*f$)6zDh@+9X*P6{31Hg+h`ykqAT+WT5o;$b9gAq^R&p8>Pq<;Sb_0V z{kU<7??m@*I=Yn4W9G3$SKzyFJ37$s=t}KJS0sPSB#=U33A9}~bS0~!6KoLWEiv=g z|J!imVe5iE|CgZ+2cRo+6S_rrqL0-?w4+&=g>%vNpP?)A9lAolqJjPs`6t4H=Ohy= ze-6*T4H}c-_i;OP1+GB{9E=V$2A#qEX#L5NKMNgrF1iBmU^ZNeZozUi;4jgY{28m` zzvvH;is$nDyM$+*n|#@H!$zcspaDILS-2F>#vidU7H^e&8Fj*@r2C`&Oh*TN8x3?d z`X%-adU*drCz9j5q+WqEH%49ook9oP&nYnyD%WORV3=zufP!})r+0yEEh_%mAn5V~R~(ch4#wM$kaADUkX zOZ)tnjEsip(wvR%eS7qu3$^4aK%>pRT+yhgXSc>APYD|8~) zpes14ef<8PK!!7&h*|gq8o*-oEG$C<{36_rc5o1V-g9+GmNqxKMFr9Pa*?hO<@L}N zY>a)dS%-A;JWnB`HW_QsCEAY$a1sqH=LN}(3!*QQn&^_ZLIdlF4%`PlY(vm`x1*zd1VN3(ytmhn}tB z=mZ}`m;Pn6{%j=RbZRj-?(wQ5Bef9?XghjX_Msi;>YP{>4WuDD<8#oNc0>of2yHho zyc1o4$IyB+(5-$R3;O(j#*H0qMrXV$+>3U25HmBsFgX*Y&;ZLvx-L3EL$rNMbS2xO z?K-3V_e9%WgRa1E%>0Kq#&YAEYXbTu@lZH3^4~@~T!ap=935~qdRV_em-q*?{b96T z{w~SDMbH5&pj%cqJO?xX{%;p<9N<#))c3_Kyas)q??n&Q3+O9)F8VwF!$@yN-v@uA z^$K)N_PRJ4NNIEhvLanK(v7?F{7+-*=aFHA8@na$K==G_bY{6PPPU>7X7(I?@pQ!c zcmvkOr_mpsYtR6*U6KS=8nZ|@LHq3)=^HNL`8VQ6$Z$!gp?f|n(o4|t47r% z{EsOA2i@zF=poD3J?XCyx&md;t*V4>QT-@yo93o78C@_7pTu#v1T!=3k#yV<{nKv` zG=CVnRin|4$D%9vF#20^IyS_2(24CvpR)bvA_GSO5458r=qokv<;l}g0e#0e zL(4m3RlEW{oN2WF!{|WIpq3?qOVSy`> z`qj{-tcM=9^UxPgJFJU+(Do0YPtRlFGw67)hHs|1v7^Ok#Gj%sh;PwAenUGt7@k1u zpVlW?ky7YmRS{kCR%m$-G@t=!`@7Ko?nk%iQFOxTXSlKA>*#a;5xT@X&^ zBia4MY%x>48y??=B4SE5^d469(#tCE#&hME5mS6goE@M3hPJ+Lxf zj*ajRbWh(v&&d1e-flqy-ifZr-tZ)PHVR*zOrR=yhU%gLwnVq=!mD}yJ-t^&!C0(E zdJ@{fvdCYLuFzKW`8|Xly295a9aan*gy)6b!mGlY!gM(KnsgHREHYfe`RGzDN54il zM#cS6p8eV+u+zgz=meUeE7k*@*(j`p51}hF51r78a06OzXF4+eMVBal|0IAi=ox5) z{^U9b-GUzI%&$Z1--3304_a?3`qa!tS8@p&z%F!x|Dx@3UYDfPMY(ZLDxwV4F_k-iG+;DcD*-~Wra z@yp{!^i=u9?teuGtTZH9 zq2_2m?a+X_VCL`tU&4(MU4ceC3=Lo$y2R7aj%J}-vKU?3FVJttJ=g`a-;mVrhSuwi zuH5i&EPD7JK_@)p2A+TSY8DwT*<5rcOVJKKLj&7^F7-d?cSOFS$qb64OJ4@v(=4=p zmngpqoxpWyAUC4z?+hml<@q;&$D`s*G{V=={Kb*K3f-E|(T+Bw9qmTz9Y6y-i5}vj z!;<{w=t{Q7CU_aT^pBuh`&gPAJD83R{4%-{3()~qqXVyx^pEHs{)(>9J~W`*HzqSL zj`mX%ZPyH4>hsb19ntnzp#h`^abv~dSOf1uPw~r9VP2#cq8%)a{IAf%xEZtXAUbgI zo06xdDteZhqbt)54YWVHMK>ekrc?Jt!DHx3%tAYw8|n9={A2VGeuJKoKhS_rpznif z!;_BNp@H^7S8`Z*7rHeQu_G?P%-{b%p1I+#Y}}kgTmdhnLKAc)?nVckfG*in=&64W zozc742-l$Ri=$|uXWWtmR0HdiZh;0m7=3ysU^Bn}U*N_si_Peaj-!7Ps(NekXSjao zDV~f5G#!1upF{U@bCmBu58GaJ1y7;@pFSc9tOQ!W4%%N6OnVwzaZ?rBp$!M2GrKJu zA5K9VK93GGH(ZV$*7cYP2pxC_+TZW!iX271zKe`Z`l&yX=id&`Cd0jHiv}_XUE+y& zCcc6mqVLc{_dC|YT%(euY=AyqozX2wqXSOGhByyh;h)ezQ@17k=f92T-&0zZ3?plS z&a4-@0)x<}V-&hlvbf$0@Kir-atEE5#^sm`EGP2vW-sa*Fhhz^U;;M3?2C9$iExycM7(^^gM1{ znqM&s^NvYYqBhz=2W*B{qf7b}`gpyCuGAWI9aD|jw?ST8{P?GyRqF>MEvxp7AG(9^yY{e!|MXoEk{Juh)@5@ zo6-L6!z_FrUAYe<|0{F?e?@+taXkMnO{sB7gtgIuTA{Dpo@ij#qxD8c{)9+B73Fgx z|6R2GT69IWqX8U2S2*u|$zd&tPN4C9?1?kzKt|@>j1DvbZ8#l$q0B}DS%G%^d8B{A z`lJt{0aqEH4Acaz-xi(mC6PY_?f3R5e<00`r};@V@)hV_ZH)9D%p#q-KY5W4DC83_8GMtb{LwtI?V63J;?L z<#{0aDOL(CuYexD2I$v%^RRt*Nm8Cp_2b6VJrI4x-iVFy)}%t}RrK9HAKT)t$glNa z@@?4|U9mpsQs0DG_&}s*qXB)0_u|)hCiZ&B73KM#z>N)GK$m7Io{Qh3Uq&S!PF_GQ z(ShzmXZ#fUK6nlNiM0kDXkC>5h)(Da%!PkP{^2n9BdiePr%G~T#Y*T4qdMB*Iq0cv z9px9HU#~sT!`c^pT*qKVoDk)&qKEh`bYdT({r-R+-oMeU&O4Fk-*!%yg1%tZqaA)1{)GmXds1?ys-Y{^2JOEmxLp)a_Z=+>-6``wD3t@Iy}aTE%Obr8UEzPx`X{IJ{JRu|o=%pe6nf~guqM_*1M7}%!C0(?)6jw5kNi)u6X|Ve z{n|5c{Jb# z=s;(qGrtf$6IY=94ngbRj@Ek!Je-~cB3i!!u1UADg%)-l&iKbJdx$*gYFr11m)hzV1&&LM%Ir<7c zfv!N2=aQLML1)wmJ=Go1_Sc~+FbZv#Mz>-ry7Vt#=0C*0gd1nDDhk%3OSLULfOc@& z^U3pD7JaPFLbsqBI>W)}O5Tbd)@RXn3(){Sjr10Dy#1Iz&CL;SFxLyo(iTQ%SQ=fK z+Gs~j(ZD)Kem``EgU~Z`bENMWgy%e+X6EvVb=+gd+E`5QQlL5{`%ezLpFS_@)qCZ&fK?9inaynb) zzjU;mjP7I{Mc;f~UrA2uEofkK&^?}yuGrG><8VXxWB4mte}8y9Jnhvazff2v9XD0O z`r+B=z-`gJ>V&S$C6OMAp5hVc(msT)#Iuo}k8aIsw4cwzZ_vPgKqr#^B?|VTTX7ie z=tSffek}>0RG5XHjhdK+P0#^)MtNU!;Oo$VhK09<_k<58^3Q)n#;kC5xFB2}u0cEA z5b4d~&hXFh-!S{^B!B{8i7+dyoss9S2{(4!Dhe(LFA4iZ`GD}o@V4;o@WJqL^aV5n zeX3rM^g47aw}ii7=Fk6ox$$%!MFYt*Cwblrqf1*IJ^l62j$5Ex)dk)A?&y{bKwrH# zqmSQ6w7)0OQ~w;=&yvXh2s3~G{|j#H@O!L@KcR;s_uQo8BIsULK=W&&k56OtO?Vj^ z!0<@li3TKo}1*n;$Z z=vKUs&U6E2;ZF2BA=ev8KNZo(wm#OwPUv^TZRmKD(%d-HXCh+>wj%v8S~1s~$w1}M zS95)=jTeQZu`B79&=uN`2Jk<0$xFSJyeFEX=?l@vdk{MD^qt(;a6&i*eP_=?mvjX> z(@)UDv>6>>2WH+A=t>oypQJ0H9XAbIqbqtLdN{9${3{dFslnX1CnM0M9E0xRM6}~+ zXooMO0lkHODZPgV{yus})}ed84Gr|ya34CMBj^g2dOHc|Y|Q-ke=gw0jxRacDqOBK<<7-$q}-E76tMif-LMm^rkIdHy}c zl@=#6X^L5-FNpLY%pA%{Pef-l3oGG5^i+R~uH0sHOSYm*{9BaoM_2S8wB1Q`7^;eBWTub}moqK9%78tB@{--52-FX+I3qlfq?+FyxxlYY|m zxN+&*Vr%S!cJvIoGH;@hu0r308za3JJ=G`C8JB)938*T%5_QqQ8ls2$Y_xr+@EW9l ze*bgho=ijsehuBrrD&vU!|mt{{*CftOOvxu1r6{_w4b(U`+n$`)KK)0KZMy_<_B(!Y&*JFyV1jT1byDizMssn7CLZ8wB8_eMMmR9oQ(EY{)5;W zyomIf=+>suc8{Z5`{D;Y|Jk{Dj|}&AIXdtrG@xT>#MxIS=0{hg7~1Xv^baDP(O2p) zbOoQqI`}5KH9w$Rb`)!2kq?u>ExHlwPd(-527=C8(qS$&=vRteVmR)`m|Na z<5LXnxEA{L+6J@mN_6SdXdo{}dVQ21Kqp!(y*hbp&O#4cEA$Q55nX|v=#uqCpZj6x z4DUskbSnBDcohxsO>_&EqKA4V+Rx^2J7%^Rt(QI$87I*I3VoDV27O$rq8-&lx1tR? zU}v=B?r6Zh!|TIa(f;m61Ahn&a8{JhP15Pq5^g-5tHbqZ!_DXmXeTIarna&(J0R8x80L`t;;kn>-Db(XD8Q26hR$0t43a{ChJjGDe~U-h~D*3q5p8 z!j+M4aJb~_M{?C#nE*I7hTcfY$?r6PXXn$kTL;GNwo6Jn3U~KvKY(gX5fku81 z&%!glNCxVF&b%ACLjBOa9)=#m324VN(Y;=PuIL){Fm6W2+k>2)bm|y4&M<3z((!rd z8R&}5@g{VsW@A%)9}Vyjx|FAVnWPJ&uj0z+3|pXqo*(7i!~T&!0#9fB)V}$X zY&yE6GttxiD%#O!;pWKSjRsn9Lvk1!p!Hj#fn1HAncLAHq0ggR`#ySxwqoYL|M>?u zev75PN&={YE>%r5ux9AvcODv8e{_$Bq5%&_Pxr`3--)ikJy-)DMgv)ZuGo)gf4^ep z-~Y@1b+Uw2!=~uobwKy{3iK=tL1#D~&%rt97X6C#vC=n5AQz*1d>OiRgVBN0XkZVa z0Z;vg=ijB6L52-pi-PyinXioWr|8VTL<8D{cDN@zh;GqI%xuZVWCa_bhq4vgt|!`V zK%|FnWazQhz5p^Q>=^r=VLn82x%3hi=t_Xdn~Ov+)x8 z0$Y}jf=|%LWGfoTe$2wucgcI868gMf5MCGFgLXU))m+uf5KK+byJexA8V5yhaRRk(3SiO4fJR95T8T`I(>5z zNDFiYx+3+`sR7)$*Y~24KNLQJ9+np(Juh4m`K!Y(!tc?3evb5S;XyQz|Di9cfx>-9kczYRV8ldu-P zh4#A{-P$8)y~;l&?V4lSFPWa)cv$X0J9rM=(+|-X)2=AbyEUm-KkR{>DZf3^tI!$l zM&Ee*BfrqLC__an?v;#WeW#}OtfNuH7pVLXl50T+gzk)tSE78OB1^Rq{8~M3*B&WCt z`n6pReWA2M&qgQAyl5gl0DW=Yj0P|U-NFYV{Y;u0_izq+IzNu|HngMT=vEZinFM$y zTK__9fCJIT?MZY-3()~SMQ6SR9r({k9}f%uk{rr(1#aA{CSiB<^bSWmycZ4ZNpywg zqaA)0>CNb#9*T5_Vd-C!2CdK)=!IE$ zJsQXabg7@mdiXlJ1wVwl!oS1g=tOewPTG}2x3*?Rp1(7>agWYMPj8#>!mwv}6*|yh zwEl?juJHbFa`;sEJUZYUbW7fj^eW8!^FQk%VaxaHW@Z}9i8zCbgw@{2iS$Kz+dR; zK7y`P!QYcWilQ?tgZ5K9Y#I4o&;a^|H=}{w|2xmWH_wvc9xX%zSQf5DJNzE~Hr#_g z1$qBSp8u+7KcS(3T`s%$3oyb_UpQq4qW@8VWpXR1IH@WsE1Jp%l+6C)iFZB7o zH}YqNv(W(;paZ-Y>2Jax!k^KnWe+;BLuep5{!CUdU5p#|qD)u~oza<*J|8^;-7vG4 z;jNMX5V|r?q5~~P2U>-0$p$pg?dT!hjeZ>;MaJQu|NbkY__@G1}mAwBsR> zKML)5Y~)W0pGFViE0_)EqFeAfy7!-vv3S%{{6oh+<2N7pfi0J zU4f6#)Bkz+ZMZeu9sV624Rahw+7$?khZWF%Yec#MX8!%3vm>KT*g5PG_6-N19o!g> z3de@`hm*o5!kOq9cqM!tJp&65@ccXDRb;r7>(Q^({5YV`d4_LpcUL ztP{{fJOeXl0PS}!`X#g&t+x?9#Cxz4rVjD^--VqIB|j)W!3Rj6z>awTKS_t{(E-0f z1K5rRcsR^=I5}kH!$xTR3(zgR6n)Y4Ls#M&bR`F+xv9#{@W_~kF3q!%o`-g@5Ix1q z(T=`~{BOgp=ySar9ry^k0;m0(3|ItRnbPRfQz1;(=f)*!74}6V8-q5u7k!>5U>%%> z=iy59#gy$x^4L~D%iCg2yb+z)lh_cKq2D2YqAOVbXlBdOsm9#+#%qPnv?FHWCFo3V zK_ea&-j8kx8|eB|31>2qkJ#g?*Sa<^M9C|_GAn=mds!-+VOYj z3hYJ$+>8G7I*cBoqQ{d%R~tRFP0=O42;IUf&{y+dG_Y~#%07smfyb2bQ%`Z@>7Io) zT!B{n+zPlc{1H9HJJ2mTj0T$PMAEJVy7$%4r=bx#@VV#&+F=dsik)#JrroO#xN+b; z=z#yC1Dr$yDfqv59MSxm=o{{=$iFDk*Pt^VjjqrX^o-2GO1K7H`aS5D?)@Lnzk7Lt zjLedrOlDLYefPIS2kMF*(gEn#?>KaZGsD?v#|tqFm!OAkQ<$H>Tj185i>^o~Y=_-a z>Fk+ErjTJEFQO~(ZukKjz#4R^x1xu1AG#Gs&<+b`%br={qGn*f!0R1tT7r$ z8+7Trgz3KA80pY(M0h89Snflg<9X=QumRoUZ_!h~4-GVLj_jE|u7R#lCp7TxXu!SD zfcr&yaFR}^hI8Zd>*p$$fKMq}UP4qa(9>dC^Sd)uhIMXi&wS3Kd>Q%usXv>v&4v=) zR`Q*FN4&sM`TRlQ^+wL;Y3_I8zm)%IBcK0MpY9Cs90h)+(0Eg(0xuu}aS7+*OLR1e zdh1C4MV&KoAn6TwCiQgX9$KW%#Z$Q0YxxS3xGULBN!ClO3OAJnV=2I$W zJC^}!|EKI1(rpRmUalI{{2v2$Vvw#}9;$A*mAuhh=aODPz1I_34LUxxdiVy4!eO}!h*FUx>_Hjti4d86p} z1bOGiM0j_l9?Ql2i$rA`l%;SJ*L@M`T<$-jle4H?iF(E9=sg1R^A@h7Y#(`-MEx&F ze?|Vx8074*6K%ia{zI-KQMVp-Psu8=z3<}hWuyg zXdaz@iXU-3#r-78nsY56eGdAmL7Shr{M09~9@JaSHIVW})XVJuJq%Kh%#U#`c}HSU z8$H7HF4usV^)=MHp7avxl(d8Rd=%wH39cLizJ-2n<^Cz^){VNgsrL!@JGdU9PGu{0thLq})$_ygKUSA%AHMl$ZM%1bq*EoF3&#i{yXL zkM>{C=XqT7Ngu(NY4h5t{og>s4?o>gH7OiV=YMdurqc^!pf1>twD0}q)bmq=0n2es zr>rvV_ywN%jAW2%q%R`4YiV=pQ-}21k$9SRZ}{Kensura`9n#n6AkxL_)ZLL@o6;N zLVhkfTTh$cDWAh2bIJdcdp}Qe&!16J?{c-I?jMnVfO?-&zKnJyx!$0Un#+9;2S0DGc@wbuOaLX6lsZYDu|YVt$%3 z$f?g3>ek{q^*PP`zlDx2rEyUzeoMoS*oYdf@jTMgxxa(!3es&z`)M0aq3!bw*qBbo z5tyIK)T>PSO6~_!UV(H+(nDi424a22^D{L^JpV(Y@E$rUzOmB-0Ys3IgQZXmjD^z-&t92~Z$&jqfrxOD&CePmjeqNxTzqu}_pTb-$ zUgookzH(4^4u1NdJ`N|v>C|Bdrr?H{!4N8*&HZpZ5y4fU{0Mos6ZPYCR*c@?`%h=j zMcZR^Rg?a{qiqxFWj;|>kv2Ujn?kxOWnJ(r|NWc#)Vi4ldFb%|81QTIW|DX6laKok zVp*R!H8l#aByaV90(qW#b)(V45x~!s*Q4LNqQ7$^AeZR#bX4je=KN1*rv}$bR9-;z zcW}+)zBu*ka)0WRoj|T+fcF__8+|;(eOcx6|%a%sG<4 z(y6oPv?RH?lZ@1!Sb>E&jzxvum5cYumz>3j)|zvcc_3jFM&W0I+!`2YJn9D_Ba?aNfiL7+Fp zjORz256L^g{XgU{k23q}!i2u#`Z@E@Uy)IV&c34JR!ie^E*1QI!PO`3dowdXRjE5a zxlP?e0Cy1S$5H2AT*&n&gMWdKP}ZNT827i4SAjsrapj{3a-Dof6e9K)1Sus$ScYOcpQc_%8creqAJUuX@V}oHu_fnI=T6H0 zihvK|aPm%l`chV&zFzUq-wVlIMujyrE6HIM*(N$`j(*zUi0I?t$V*Dte{ZtW_&NrxLxH zx1_u_ZPrBoSy8_Xefe2LzZYfx`>P~wq3|5^&+?^c@GFIW?qepqa5o+H;r?avA0WMn zPM#n=DLTC&>Te~#EbVJie?8Z!&ku3)b>zKGos!f|KS4wPT<+(6I(!J+*qkq)P0m|apuo|bkdZ9 zqI6!J`}4Tp!1aec{y(3IbX1s{^R0uR#BQaTwz!_)uMI2-rnXk3S~HkmH?tD)4rfb^~O(Hnb4 z=hL{K69Md_?qvF%jLR?|b*D$afBOEvoeV$EbJe8bb9iCojbMP9r2RZWhwG_-9@jGN zms^Lcat!(kGrF3qKjnVvgdfny2WJ@iwU^7Ili<|XOOUvj&j4wh5d&)4B3 z?(5LW_-HtYI{!xJ*87XH@9AdqP@3pIB!46N`Ns~(uS@!I?(;Y(>1mXW zT9J1l16GXSSCHqY1zt_x$Ef!(Sq>}{@+hED*AbZMiUvNHg(&P_bmDsmM3!E5$!MiPf*`P(9bgXV#>?V z<|PJfNBW#7`-Xew&z>{zokaHq8C|J(3-{kr=}j8=`Ih`=$-9{J2<|7*VYVo<`~}(% z;<|$T8zYFz{}aq%+6?D9}ZG4BaE2%ex zbc)6|F?fB_9Z8Sjx}A0t7@!Y%W2kaJwu-(;ras~tMZ0bP3HmY8xd|q{i;71XWPKE# zP3Cd(ZllAyxXz@r%kc=;sn504|CsB0G7jUZ&u0Yl1Rdw4kJq{O(q_Iv^XW`KH`8xb z#@XZG+&`Y1^>3e)rwUQAKAo+kQ70Oo`rP!Nd-KkxgEy)39G$#Ky5N7xhmrn`@+Z0c zlwr_oDSwZ2lO!vZ^FIME&iwzcQs7@2_j8O+{jA5!x&BAvV+_`q%g-4^eS|=7;XZ$K zbR*^>?!H=y2J>Ssk@<>~a{|I{BHbzhG`t5CN)>HX#2jOX{Ks zZedR5-I5+7$TzR?japmVKz*UgzbgmwB-qSofTSCX*$IKp}zn5b| z1L>~>_gx4gZ{!uA-5ccZ$c)SSSES*q6iy)XE;?I)mqg`Zm_^#p7=pT*0sS1K-Uu%K zR$%5oq1ToB7rDQWzJ}8Ax>${i$-gn$oJ0O0`g@!79_qbK*@Hg+kCJgR2DI}#Gm&xF z$Q$i4QvMc|N0R2BLra~;y`NPKQjN5qFK9ECx&yh+6W7ZOxPUe-DPQoP z@+-(6YQy;OkBX&oQfDSRnaR4D#(plGa_Gex=`E4ki4zEGE7ynI_oBvST$gk8=DLEb z4_9B)ba(1g_&-DcN?Sii@qWU%ntp~;J}t(0jH#Xae93xT=__embnp;y`k6#}5EXaD zf}TZsZPXb=$2+sNW-*yCZEp4BO`d`!b4$@mm@1X9Cs9QYB>;0$g-I>27Oh$eh zU4R4VtR&HHr1GCJ=yuAUr0g7AOMV+7{{bt+tnO#9%A_a9s;niwmb!z{PgCmUqRlwU z`TO{(4)_fdDQ@AZSJG`{oI%BNqS1AvAEndwUL0zafp8RxOI(Rt-wc-{k9B06STvta2Rmq=7y(Te3>zzdh zmAHQ6{u1)1M;`+S+|Suu=hD6#{oKufe*U8Vx%AU0>hAYn3A~-eW-`B~;Y>POLnS|z zu>|?EDQ`jgV02>HZmyr{{A=>+M*bDF?ML3LwCNUooY2D=IR}7{7W6D zKCPI@Ao72p-EuN3(2t)cq%-3;BV!j)zDmW~G{|vm4`wj&B33VT*FF$*t`~>xHcKmmvLtoCDqVRwJ**6<4CEb*cZjNOy zLgQ1P>&YucyFp}BB-p!2PmRG|$8ShKLflr_dfT#YEJOPl57&B9OUaM=Ip>Rf=LzK=N0{}2_7F``mY#IqoZ zR)MMkts>$xsH0LLZ6`u6cmxnRdibcK0el3ov1pWlMu#G()i!~K=&4vAi9v0kp-FvI z)QIsB-w_|NPMh|#uxD=EnPqps``z#E@00{*GDer~q>kmllgydGY}7O97Z9CxpSqB} zMe;||8C-S{;%2(rRYZvXcs%uL#Fmh6Wk~EcGaoS=NEAEC{A0Ws?rxU&(@Vw0=7Qf+ z&G0tJ?F)KgXdb|G+VSNmKnDH}3&I!>OBQkb?^>&IG{1Cl!#5DQm|I0Lw&^&=q1;d}XEcgVX2Zx!#+rtrycj>nwZC`s6 z2GM&To=v&;!E%@v`#oA>$2fEXu>|fQ`Tj40d_ze>FtIEd@+$ECkoW4sdoGJj^r!1g zEw5~Wca#28@IdCrk~j0hW_p1xpTZRKa5$IPb54$Qe*ZtD7{Gwj#!?^Gh0(g`v^J|* z=4w4yD0UvdfR{>vt-vc-Sj)m9+y~xxw3^Y)M8AZdbH7^?%cld(Q?ZXBcu+qC-+<8H zSh}5B>;z&f;LQOWq1bGA5zL4=@F2XAzL!4YD0!Z8tC-zJ|CQFi5`si5Rhyd-f8Guw z-0nHN0^u#-0}&Sc75UFOB9%N0@2QKW_a(E_^izyezToGbeV%a3b)HU~zZ@ejHAJmMqo>$xIylKzi=rE69(Li-pPWP7f6pAfBNn zu)!?7N8Xu%FL~82@<8%4Iw;(1=DPCgsr2W&;N$7t!&}gZqgTk>TWE?UxE$3LEaw3lWRKy&&CZNbF%-aLXf3peNQH(QVAlWx*|%#Vz1F@M<{za5vKbjA(0};zuzw z8_E5^J;>8r|4IOWAYO7(7Yg@X`GSSBq$3NK665hA2E{7zdXC)0Ts{5U_yZRIju?xJ z71Mtc{=dl&;PuQug7YOfhe{ffq^XfLI(!7!L46Uz&i`> z!CX)Hk$POPK4c)6H?xtj_rVog$q|dd?^4HzrhNY`q43p(r3~C6e+sq+VH0^ThT0Q{ zAzY6~;s(pQF#8(4SMbjCcM+Y|o_wYrGD~9&*a~=JL&=Y$pA*bNu>xsAEC$?<_)c;g zepQEi5jQj3o!(-OTMoaD7c3-~NBoptln7xz20IJy12`RYp^ccT`E=q@`j6ci&4(nG zjM#F(T;eZTR*J}4;$5(gxY%`$>%{OnW@ZsR!K%r}@`#c2@`(??Zo~fwZ(@EYxY#!8 z3)GL%HNdi&4{`n{2^(1Iv~UPw?=!F(!2t}3dBO?DS86|x#g{a1hgcQ8y+o(Elb53r zfQ$V@xofC{@y|G7vi#K3A7Toz8-h0x@zsG#8uzPciN;uXVhPmml3#^4iTWDRO1udE zlD>MY#xBH1Jme6Zt8fhViRH{uu`>)^CLhfK{q)kQ#6yryGgM1{4R24r3eH!=5amtM zCA(WCc@2OLA;Uq2RN4F_A1FZyi^bA3bB?>6XJ0A6$+{0P`^?I*CnX{S`+Yk4_l)7dIGFMvf8)8QN;7BQbszYD$!?&tcc z$=n?I`A_TsL%Z~2lRAmPAc+3N3E;=c-_~W)4*(yhpIATeTo=(GdOplpv@iVMviy(K zHQ-sq2hX(H_6x@?K}AMDn8o#dAYE?l{P3kxk4%Eo4NeNn3K6g4l^4m^F>^x2L*Xug zSBbwRp9Y=>=P=w{BoB+M>}UR&#V~vZ;&*s=+|^pB=Ogwl0()qjV!?2ReaN>UJcM2d zu@f2};NQV32P1Vm3@-LBiYTx?`jDJoQ%vXOH}s0(5JuoH<2%43h%F3`B7VpLqlsg1 zvC)WBGdBbLELbS~wJePyH^4^18BZQdK9RVQdNOgae$r*~>wldA2VM!7r$_YS+I^7o ziSOWhz$@U0EykPiMy>ygxYHWItkn5?r(sSC)(-lpDx z{xG;N;#1_$e{~4-B({tz&+Di+kixeoUm z{0`zF)VIie;oc!e!WZ*Ha~#+J>YU3AMgf!|R7P&0@n`DJ2uvd0)XQ^;gsXU~AlkiV?_a;_ z>ow7um6T$gZ!rgLD88`BH|g~Z>tb`z6x)J%)+Od7TSju~8|LKHbZd?2Vzzfp@wZdD z>=|h^^l^Cm8wsACLC*0K+W@0?hoG6Q^A3tLhGS{4;o<9e5^dyqmgG+}avl87QqxS6 z!@|v>5u-+g4Gs+p4fUF4$yzXEw%wAEm2O#JvyU>TWtx*xEOxsk%RD;GYRMRqnQFD$ ztwR-zO3lc8V`#EH(y?oXvD(8C6=zt2jI5IKY{RdI-koKhYc)GBGnX98Hget5t!*4{ zSB{=LW|>j#N@ojnP)FFyTw}5Q|(r>S)~Gg)Y@;;c)l6v hNIGo{GdY^h8ioE2zbD3+P9+Q7P1TObcBYl4{{t=}Ib8q% diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index f1326ab7ad..1fbb1aaca4 100644 --- a/internat/fr/kicad.po +++ b/internat/fr/kicad.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2007-09-17 08:51+0100\n" -"Last-Translator: jp charras \n" +"PO-Revision-Date: 2007-09-20 08:44+0100\n" +"Last-Translator: \n" "Language-Team: kicad team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -109,7 +109,7 @@ msgid "Add Pad" msgstr "Ajouter Pastilles" #: pcbnew/modedit.cpp:316 -#: pcbnew/menubarpcb.cpp:215 +#: pcbnew/menubarpcb.cpp:209 #: pcbnew/globaleditpad.cpp:96 #: pcbnew/menubarmodedit.cpp:45 #: pcbnew/tool_modedit.cpp:133 @@ -275,7 +275,7 @@ msgstr "Module [%s] non trouv #: eeschema/plotps.cpp:389 #: cvpcb/genequiv.cpp:42 #: gerbview/export_to_pcbnew.cpp:58 -#: common/hotkeys_basic.cpp:381 +#: common/hotkeys_basic.cpp:384 msgid "Unable to create " msgstr "Impossible de créer " @@ -351,12 +351,12 @@ msgstr "Librairie existante " msgid "Create error " msgstr "Erreur en création " -#: pcbnew/hotkeys.cpp:411 +#: pcbnew/hotkeys.cpp:430 #, c-format msgid "Footprint %s found, but locked" msgstr "Module %s trouvé, mais verrouillé" -#: pcbnew/hotkeys.cpp:573 +#: pcbnew/hotkeys.cpp:592 msgid "Delete module?" msgstr "Effacer Module?" @@ -881,7 +881,7 @@ msgstr "Sauver Circuit Imprim #: pcbnew/tool_pcb.cpp:247 #: eeschema/tool_sch.cpp:65 -#: gerbview/tool_gerber.cpp:244 +#: gerbview/tool_gerber.cpp:233 msgid "page settings (size, texts)" msgstr "Ajustage de la feuille de dessin (dimensions, textes)" @@ -891,24 +891,24 @@ msgstr "Ouvrir Editeur de modules" #: pcbnew/tool_pcb.cpp:254 #: eeschema/tool_sch.cpp:81 -#: gerbview/tool_gerber.cpp:255 +#: gerbview/tool_gerber.cpp:244 msgid "Cut selected item" msgstr "Suppression des éléments sélectionnés" #: pcbnew/tool_pcb.cpp:258 #: eeschema/tool_sch.cpp:84 -#: gerbview/tool_gerber.cpp:260 +#: gerbview/tool_gerber.cpp:249 msgid "Copy selected item" msgstr "Copie des éléments sélectionnés" #: pcbnew/tool_pcb.cpp:260 #: eeschema/tool_sch.cpp:87 -#: gerbview/tool_gerber.cpp:266 +#: gerbview/tool_gerber.cpp:255 msgid "Paste" msgstr "Copie des éléments sauvegardés" #: pcbnew/tool_pcb.cpp:263 -#: gerbview/tool_gerber.cpp:273 +#: gerbview/tool_gerber.cpp:262 msgid "Undelete" msgstr "Annulation du dernier effacement" @@ -924,7 +924,7 @@ msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" #: pcbnew/tool_modedit.cpp:115 #: eeschema/tool_lib.cpp:170 #: eeschema/tool_sch.cpp:108 -#: gerbview/tool_gerber.cpp:283 +#: gerbview/tool_gerber.cpp:272 msgid "zoom +" msgstr "zoom +" @@ -932,7 +932,7 @@ msgstr "zoom +" #: pcbnew/tool_modedit.cpp:119 #: eeschema/tool_lib.cpp:174 #: eeschema/tool_sch.cpp:112 -#: gerbview/tool_gerber.cpp:290 +#: gerbview/tool_gerber.cpp:279 msgid "zoom -" msgstr "zoom -" @@ -940,7 +940,7 @@ msgstr "zoom -" #: pcbnew/tool_modedit.cpp:123 #: eeschema/tool_lib.cpp:178 #: eeschema/tool_sch.cpp:116 -#: gerbview/tool_gerber.cpp:297 +#: gerbview/tool_gerber.cpp:286 msgid "redraw" msgstr "Redessin" @@ -948,7 +948,7 @@ msgstr "Redessin" #: pcbnew/tool_modedit.cpp:128 #: eeschema/tool_lib.cpp:184 #: eeschema/tool_sch.cpp:121 -#: gerbview/tool_gerber.cpp:308 +#: gerbview/tool_gerber.cpp:297 #: 3d-viewer/3d_toolbar.cpp:53 msgid "auto zoom" msgstr "Zoom automatique" @@ -981,34 +981,34 @@ msgstr "Drc DESACTIVEE" #: pcbnew/tool_pcb.cpp:335 #: pcbnew/tool_modedit.cpp:212 #: eeschema/tool_sch.cpp:257 -#: gerbview/tool_gerber.cpp:423 +#: gerbview/tool_gerber.cpp:412 msgid "Display Grid OFF" msgstr "Suppression de l'affichage de la grille" #: pcbnew/tool_pcb.cpp:338 #: pcbnew/tool_modedit.cpp:216 -#: gerbview/tool_gerber.cpp:429 +#: gerbview/tool_gerber.cpp:418 msgid "Display Polar Coord ON" msgstr "Activer affichage coord Polaires" #: pcbnew/tool_pcb.cpp:340 #: pcbnew/tool_modedit.cpp:220 #: eeschema/tool_sch.cpp:261 -#: gerbview/tool_gerber.cpp:433 +#: gerbview/tool_gerber.cpp:422 msgid "Units = Inch" msgstr "Unités = pouce" #: pcbnew/tool_pcb.cpp:342 #: pcbnew/tool_modedit.cpp:224 #: eeschema/tool_sch.cpp:265 -#: gerbview/tool_gerber.cpp:437 +#: gerbview/tool_gerber.cpp:426 msgid "Units = mm" msgstr "Unités = mm" #: pcbnew/tool_pcb.cpp:345 #: pcbnew/tool_modedit.cpp:230 #: eeschema/tool_sch.cpp:269 -#: gerbview/tool_gerber.cpp:443 +#: gerbview/tool_gerber.cpp:432 msgid "Change Cursor Shape" msgstr "Sélection de la forme du curseur" @@ -1025,7 +1025,7 @@ msgid "Enable Auto Del Track" msgstr "Autoriser l'effacement automatique des pistes" #: pcbnew/tool_pcb.cpp:362 -#: pcbnew/pcbframe.cpp:410 +#: pcbnew/pcbframe.cpp:408 #: pcbnew/set_color.cpp:389 msgid "Show Zones" msgstr "Monter Zones" @@ -1040,7 +1040,7 @@ msgid "Show Tracks Sketch" msgstr "Afficher pistes en contour" #: pcbnew/tool_pcb.cpp:375 -#: pcbnew/pcbframe.cpp:431 +#: pcbnew/pcbframe.cpp:429 msgid "Hight Contrast Mode Display" msgstr "Mode d'affichage Haut Contraste" @@ -1094,7 +1094,7 @@ msgstr "Addition de graphiques (Arc de Cercle)" #: pcbnew/tool_modedit.cpp:180 #: eeschema/schedit.cpp:313 #: eeschema/libframe.cpp:502 -#: gerbview/tool_gerber.cpp:394 +#: gerbview/tool_gerber.cpp:383 msgid "Add Text" msgstr "Ajout de Texte" @@ -1104,7 +1104,7 @@ msgid "Add Cotation" msgstr "Addition de Cotations" #: pcbnew/tool_pcb.cpp:456 -#: gerbview/tool_gerber.cpp:387 +#: gerbview/tool_gerber.cpp:376 msgid "Add Mires" msgstr "Addition de Mires de superposition" @@ -1112,7 +1112,7 @@ msgstr "Addition de Mires de superposition" #: pcbnew/tool_modedit.cpp:190 #: eeschema/tool_lib.cpp:93 #: eeschema/tool_sch.cpp:235 -#: gerbview/tool_gerber.cpp:402 +#: gerbview/tool_gerber.cpp:391 msgid "Delete items" msgstr "Suppression d'éléments" @@ -1433,7 +1433,7 @@ msgid "V Size" msgstr "Taille V" #: pcbnew/class_track.cpp:678 -#: pcbnew/pcbframe.cpp:441 +#: pcbnew/pcbframe.cpp:439 #: pcbnew/controle.cpp:203 msgid "Track" msgstr "Piste" @@ -1841,92 +1841,92 @@ msgstr "Test Modules" msgid "Compile" msgstr "Compile" -#: pcbnew/pcbframe.cpp:260 +#: pcbnew/pcbframe.cpp:258 msgid "Board modified, Save before exit ?" msgstr "Circuit Imprimé modifiée, Sauver avant de quitter ?" -#: pcbnew/pcbframe.cpp:261 -#: eeschema/schframe.cpp:187 +#: pcbnew/pcbframe.cpp:259 +#: eeschema/schframe.cpp:181 #: cvpcb/cvframe.cpp:169 #: common/confirm.cpp:109 msgid "Confirmation" msgstr "Confirmation" -#: pcbnew/pcbframe.cpp:361 +#: pcbnew/pcbframe.cpp:359 msgid "DRC Off (Disable !!!), Currently: DRC is active" msgstr "DRC off (désactivée !!!), actuellement DRC active" -#: pcbnew/pcbframe.cpp:362 +#: pcbnew/pcbframe.cpp:360 msgid "DRC On (Currently: DRC is inactive !!!)" msgstr "DRC On (Actuellement, DRC désactivée !!!)" -#: pcbnew/pcbframe.cpp:373 +#: pcbnew/pcbframe.cpp:371 msgid "Polar Coords not show" msgstr "Coord Polaires non affichées" -#: pcbnew/pcbframe.cpp:374 +#: pcbnew/pcbframe.cpp:372 msgid "Display Polar Coords" msgstr "Affichage coord Polaires" -#: pcbnew/pcbframe.cpp:379 -#: eeschema/schframe.cpp:265 +#: pcbnew/pcbframe.cpp:377 +#: eeschema/schframe.cpp:259 msgid "Grid not show" msgstr "Grille non montrée" -#: pcbnew/pcbframe.cpp:379 -#: eeschema/schframe.cpp:265 +#: pcbnew/pcbframe.cpp:377 +#: eeschema/schframe.cpp:259 msgid "Show Grid" msgstr "Afficher grille" -#: pcbnew/pcbframe.cpp:388 +#: pcbnew/pcbframe.cpp:386 msgid "General ratsnest not show" msgstr "Chevelu général non affiché" -#: pcbnew/pcbframe.cpp:388 +#: pcbnew/pcbframe.cpp:386 msgid "Show General ratsnest" msgstr "Afficher le chevelu général" -#: pcbnew/pcbframe.cpp:394 +#: pcbnew/pcbframe.cpp:392 msgid "Module ratsnest not show" msgstr "Ne pas montrer le chevelu du module pendant déplacement" -#: pcbnew/pcbframe.cpp:395 +#: pcbnew/pcbframe.cpp:393 msgid "Show Module ratsnest" msgstr "Montrer le chevelu du module" -#: pcbnew/pcbframe.cpp:402 +#: pcbnew/pcbframe.cpp:400 msgid "Disable Auto Delete old Track" msgstr "Ne pas Autoriser l'effacement automatique des pistes" -#: pcbnew/pcbframe.cpp:403 +#: pcbnew/pcbframe.cpp:401 msgid "Enable Auto Delete old Track" msgstr "Autoriser l'effacement automatique des pistes" -#: pcbnew/pcbframe.cpp:410 +#: pcbnew/pcbframe.cpp:408 msgid "Do not Show Zones" msgstr "Ne pas monter Zones" -#: pcbnew/pcbframe.cpp:416 +#: pcbnew/pcbframe.cpp:414 msgid "Show Pads Sketch mode" msgstr "Afficher pastilles en contour" -#: pcbnew/pcbframe.cpp:417 +#: pcbnew/pcbframe.cpp:415 msgid "Show pads filled mode" msgstr "Afficher pastilles en mode plein" -#: pcbnew/pcbframe.cpp:423 +#: pcbnew/pcbframe.cpp:421 msgid "Show Tracks Sketch mode" msgstr "Afficher pistes en contour" -#: pcbnew/pcbframe.cpp:424 +#: pcbnew/pcbframe.cpp:422 msgid "Show Tracks filled mode" msgstr "Afficher pistes en mode plein" -#: pcbnew/pcbframe.cpp:430 +#: pcbnew/pcbframe.cpp:428 msgid "Normal Contrast Mode Display" msgstr "Mode d'affichage Contraste normal" -#: pcbnew/pcbframe.cpp:473 +#: pcbnew/pcbframe.cpp:471 #: pcbnew/controle.cpp:217 msgid "Via" msgstr "Via" @@ -2730,8 +2730,8 @@ msgstr "Lire config" msgid "File %s not found" msgstr " fichier %s non trouvé" -#: pcbnew/pcbcfg.cpp:176 -#: eeschema/eeconfig.cpp:174 +#: pcbnew/pcbcfg.cpp:192 +#: eeschema/eeconfig.cpp:190 #: cvpcb/cfg.cpp:71 msgid "Save preferences" msgstr "Sauver préférences" @@ -2778,9 +2778,8 @@ msgid " of " msgstr " de " #: pcbnew/controle.cpp:147 -#, fuzzy msgid "Pcb Graphic" -msgstr "Addition éléments graphiques" +msgstr "Pcb Graphic" #: pcbnew/controle.cpp:147 #: pcbnew/controle.cpp:209 @@ -2929,406 +2928,384 @@ msgstr "Le texte est la REFERENCE!" msgid "Text is VALUE!" msgstr "Le texte est la VALEUR!" -#: pcbnew/menubarpcb.cpp:41 +#: pcbnew/menubarpcb.cpp:42 msgid "Load Board Ctrl-O" msgstr "Charger Circuit Imprimé (Ctrl O)" -#: pcbnew/menubarpcb.cpp:42 +#: pcbnew/menubarpcb.cpp:43 msgid "Delete old Board and Load new Board" msgstr "Effacer ancien C.I. et charger un nouveau" -#: pcbnew/menubarpcb.cpp:47 +#: pcbnew/menubarpcb.cpp:48 msgid "Append Board" msgstr "Ajouter Circuit Imprimé" -#: pcbnew/menubarpcb.cpp:48 +#: pcbnew/menubarpcb.cpp:49 msgid "Add Board to old Board" msgstr "Ajouter un C.I. au C.I. actuel" -#: pcbnew/menubarpcb.cpp:53 +#: pcbnew/menubarpcb.cpp:54 msgid "&New board" msgstr "&Nouveau Circuit Imprimé" -#: pcbnew/menubarpcb.cpp:54 +#: pcbnew/menubarpcb.cpp:55 msgid "Clear old PCB and init a new one" msgstr "Effacer C.I. ancien et créer un nouveau" -#: pcbnew/menubarpcb.cpp:59 +#: pcbnew/menubarpcb.cpp:60 msgid "&Rescue" msgstr "&Secours" -#: pcbnew/menubarpcb.cpp:60 +#: pcbnew/menubarpcb.cpp:61 msgid "Clear old board and get last rescue file" msgstr "Effacer C.I. actuel et reprendre dernier fichier secours" -#: pcbnew/menubarpcb.cpp:65 +#: pcbnew/menubarpcb.cpp:66 msgid "&Previous version" msgstr "&Précédente version" -#: pcbnew/menubarpcb.cpp:66 +#: pcbnew/menubarpcb.cpp:67 msgid "Clear old board and get old version of board" msgstr "Effacer C.I. actuel et reprendre ancienne version" -#: pcbnew/menubarpcb.cpp:73 +#: pcbnew/menubarpcb.cpp:74 msgid "&Save board Ctrl-S" msgstr "Sauver Circuit Imprimé (Ctrl S)" -#: pcbnew/menubarpcb.cpp:74 +#: pcbnew/menubarpcb.cpp:75 msgid "Save current board" msgstr "Sauver le C.I. actuel" -#: pcbnew/menubarpcb.cpp:79 +#: pcbnew/menubarpcb.cpp:80 msgid "Save Board as.." msgstr "Sauver C.I. sous.." -#: pcbnew/menubarpcb.cpp:80 +#: pcbnew/menubarpcb.cpp:81 msgid "Save current board as.." msgstr "Sauver le Circuit Imprimé courant sous.." -#: pcbnew/menubarpcb.cpp:87 +#: pcbnew/menubarpcb.cpp:88 #: eeschema/menubar.cpp:72 #: gerbview/tool_gerber.cpp:89 msgid "P&rint" msgstr "Imp&rimer" -#: pcbnew/menubarpcb.cpp:87 +#: pcbnew/menubarpcb.cpp:88 #: eeschema/menubar.cpp:72 #: gerbview/tool_gerber.cpp:89 msgid "Print on current printer" msgstr "Imprimer sur l'imprimante par défaut" -#: pcbnew/menubarpcb.cpp:92 +#: pcbnew/menubarpcb.cpp:93 #: eeschema/menubar.cpp:102 msgid "&Plot" msgstr "&Tracer" -#: pcbnew/menubarpcb.cpp:93 +#: pcbnew/menubarpcb.cpp:94 msgid "Plot (HPGL, PostScript, or Gerber format)" msgstr "Tracer ( format HPGL, POSTSCRIPT ou GERBER)" -#: pcbnew/menubarpcb.cpp:101 +#: pcbnew/menubarpcb.cpp:102 msgid "&GenCAD" msgstr "&GenCAD" -#: pcbnew/menubarpcb.cpp:101 +#: pcbnew/menubarpcb.cpp:102 msgid "Export GenCAD Format" msgstr "Exporter en Format GenCAD" -#: pcbnew/menubarpcb.cpp:105 +#: pcbnew/menubarpcb.cpp:106 msgid "&Module report" msgstr "Rapport &Modules" -#: pcbnew/menubarpcb.cpp:105 +#: pcbnew/menubarpcb.cpp:106 msgid "Create a pcb report (footprint report)" msgstr "Créer un fichier rapport (rapport sur modules)" -#: pcbnew/menubarpcb.cpp:109 +#: pcbnew/menubarpcb.cpp:110 msgid "E&xport" msgstr "E&xporter" -#: pcbnew/menubarpcb.cpp:109 +#: pcbnew/menubarpcb.cpp:110 msgid "Export board" msgstr "Exporter le C.I." -#: pcbnew/menubarpcb.cpp:115 +#: pcbnew/menubarpcb.cpp:116 msgid "Add new footprints" msgstr "Archiver nouveaux modules" -#: pcbnew/menubarpcb.cpp:116 +#: pcbnew/menubarpcb.cpp:117 msgid "Archive new footprints only in a library (keep other footprints in this lib)" msgstr "Archiver nouveaux modules seuls dans une librairie (garder les autres modules de cette librairie)" -#: pcbnew/menubarpcb.cpp:120 +#: pcbnew/menubarpcb.cpp:121 msgid "Create footprint archive" msgstr "Créer Archive des modules" -#: pcbnew/menubarpcb.cpp:121 +#: pcbnew/menubarpcb.cpp:122 msgid "Archive all footprints in a library(old lib will be deleted)" msgstr "Archiver tous les modules dans une librairie (ancienne librairie supprimée)" -#: pcbnew/menubarpcb.cpp:126 +#: pcbnew/menubarpcb.cpp:127 msgid "Archive footprints" msgstr "Archiver modules" -#: pcbnew/menubarpcb.cpp:127 +#: pcbnew/menubarpcb.cpp:128 msgid "Archive or Add footprints in a library file" msgstr "Archiver ou ajouter les modules dans un fichier librairie" -#: pcbnew/menubarpcb.cpp:131 +#: pcbnew/menubarpcb.cpp:132 #: eeschema/menubar.cpp:105 #: cvpcb/tool_cvpcb.cpp:125 -#: kicad/buildmnu.cpp:131 +#: kicad/buildmnu.cpp:130 #: gerbview/tool_gerber.cpp:94 msgid "E&xit" msgstr "&Quitter" -#: pcbnew/menubarpcb.cpp:131 +#: pcbnew/menubarpcb.cpp:132 msgid "Quit pcbnew" msgstr "Quitter Pcbnew" -#: pcbnew/menubarpcb.cpp:149 +#: pcbnew/menubarpcb.cpp:150 #: eeschema/menubar.cpp:139 msgid "&Libs and Dir" msgstr "&Libs et Rep" -#: pcbnew/menubarpcb.cpp:150 +#: pcbnew/menubarpcb.cpp:151 #: eeschema/menubar.cpp:140 #: cvpcb/tool_cvpcb.cpp:140 msgid "Setting Libraries, Directories and others..." msgstr "Sélectionner les librairies et répertoires" -#: pcbnew/menubarpcb.cpp:154 +#: pcbnew/menubarpcb.cpp:155 #: eeschema/menubar.cpp:145 #: gerbview/tool_gerber.cpp:109 msgid "&Colors" msgstr "&Couleurs" -#: pcbnew/menubarpcb.cpp:155 +#: pcbnew/menubarpcb.cpp:156 msgid "Select Colors and Display for PCB items" msgstr "Selection couleurs et affichage des éléments du C.I." -#: pcbnew/menubarpcb.cpp:159 +#: pcbnew/menubarpcb.cpp:160 msgid "&General Options" msgstr "Options &générales" -#: pcbnew/menubarpcb.cpp:160 +#: pcbnew/menubarpcb.cpp:161 msgid "Select general options for pcbnew" msgstr " Sélection options générales pour pcbnew" -#: pcbnew/menubarpcb.cpp:164 +#: pcbnew/menubarpcb.cpp:165 msgid "&Display Options" msgstr "Options &d'affichage" -#: pcbnew/menubarpcb.cpp:165 +#: pcbnew/menubarpcb.cpp:166 msgid "Select what items are displayed" msgstr "Sélectionner les éléments a afficher" -#: pcbnew/menubarpcb.cpp:175 +#: pcbnew/menubarpcb.cpp:176 #: eeschema/menubar.cpp:158 msgid "&Save preferences" msgstr "&Sauver Préférences" -#: pcbnew/menubarpcb.cpp:176 +#: pcbnew/menubarpcb.cpp:177 #: eeschema/menubar.cpp:159 #: gerbview/tool_gerber.cpp:124 msgid "Save application preferences" msgstr "Sauver préférences" -#: pcbnew/menubarpcb.cpp:180 +#: pcbnew/menubarpcb.cpp:181 #: eeschema/menubar.cpp:162 msgid "&Read preferences" msgstr "&Lire Préférences" -#: pcbnew/menubarpcb.cpp:181 +#: pcbnew/menubarpcb.cpp:182 #: eeschema/menubar.cpp:163 msgid "Read application preferences" msgstr "Lire préférences de l'application" -#: pcbnew/menubarpcb.cpp:186 -#: gerbview/tool_gerber.cpp:128 -msgid "Create Pcbnew &Hotkey config file" -msgstr "Créer les fichiers configuration des &Hotkeys de Pcbnew" - -#: pcbnew/menubarpcb.cpp:187 -#: eeschema/menubar.cpp:169 -#: gerbview/tool_gerber.cpp:130 -msgid "Create or Recreate the hotkey config file from current hotkey list" -msgstr "Créer ou recréer les fichiers configuration des Hotkeys a partir de la liste courante" - -#: pcbnew/menubarpcb.cpp:190 -#: gerbview/tool_gerber.cpp:135 -msgid "Reread &Pcbnew Hotkey config file" -msgstr "Relire les fichiers configuration des Hotkeys de &Pcbnew" - -#: pcbnew/menubarpcb.cpp:191 -#: eeschema/menubar.cpp:173 -#: gerbview/tool_gerber.cpp:136 -msgid "Reread the hotkey config file" -msgstr "Relire les fichiers configuration des Hotkeys" - -#: pcbnew/menubarpcb.cpp:200 +#: pcbnew/menubarpcb.cpp:194 msgid "Tracks and Vias" msgstr "Pistes et vias" -#: pcbnew/menubarpcb.cpp:201 +#: pcbnew/menubarpcb.cpp:195 msgid "Adjust size and width for tracks, vias" msgstr "Ajuster dims et taille des pistes et vias" -#: pcbnew/menubarpcb.cpp:205 +#: pcbnew/menubarpcb.cpp:199 #: pcbnew/menubarmodedit.cpp:50 #: pcbnew/set_grid.h:40 msgid "User Grid Size" msgstr "Dim Grille utilisteur" -#: pcbnew/menubarpcb.cpp:206 +#: pcbnew/menubarpcb.cpp:200 #: pcbnew/menubarmodedit.cpp:51 msgid "Adjust User Grid" msgstr "Ajuster Grille utilisateur" -#: pcbnew/menubarpcb.cpp:210 +#: pcbnew/menubarpcb.cpp:204 #: pcbnew/dialog_graphic_items_options.h:39 msgid "Texts and Drawings" msgstr "Textes et Tracés" -#: pcbnew/menubarpcb.cpp:211 +#: pcbnew/menubarpcb.cpp:205 #: pcbnew/menubarmodedit.cpp:41 msgid "Adjust width for texts and drawings" msgstr "Ajuster dims pour textes et graphiques" -#: pcbnew/menubarpcb.cpp:216 +#: pcbnew/menubarpcb.cpp:210 #: pcbnew/menubarmodedit.cpp:46 msgid "Adjust size,shape,layers... for Pads" msgstr "Ajuster taille, forme, couches... pour pads" -#: pcbnew/menubarpcb.cpp:221 +#: pcbnew/menubarpcb.cpp:215 #: gerbview/tool_gerber.cpp:123 msgid "&Save Setup" msgstr "&Sauver Options" -#: pcbnew/menubarpcb.cpp:222 +#: pcbnew/menubarpcb.cpp:216 msgid "Save options in current directory" msgstr "Sauver les options en répertoire de travail" -#: pcbnew/menubarpcb.cpp:231 +#: pcbnew/menubarpcb.cpp:225 msgid "Create &Modules Pos" msgstr "Créer &Modules Pos" -#: pcbnew/menubarpcb.cpp:232 +#: pcbnew/menubarpcb.cpp:226 msgid "Gen Position modules file" msgstr "Gen fichier Position des Modules" -#: pcbnew/menubarpcb.cpp:236 +#: pcbnew/menubarpcb.cpp:230 msgid "Create &Drill file" msgstr "Créer &Fichier de percage" -#: pcbnew/menubarpcb.cpp:237 +#: pcbnew/menubarpcb.cpp:231 msgid "Gen Drill (EXCELLON] file and/or Drill sheet" msgstr "Gen fichier de percage (EXCELLON] et/ou plan de percage" -#: pcbnew/menubarpcb.cpp:241 +#: pcbnew/menubarpcb.cpp:235 msgid "Create &Cmp file" msgstr "Créer &Fichier Cmp" -#: pcbnew/menubarpcb.cpp:242 +#: pcbnew/menubarpcb.cpp:236 msgid "Recreate .cmp file for CvPcb" msgstr "Recréer le fichier .cmp pour CvPcb" -#: pcbnew/menubarpcb.cpp:250 +#: pcbnew/menubarpcb.cpp:244 msgid "Global &Deletions" msgstr "Effacements &Généraux" -#: pcbnew/menubarpcb.cpp:251 +#: pcbnew/menubarpcb.cpp:245 msgid "Delete Tracks, Modules, Texts... on Board" msgstr "Effacer Pistes, Modules, Textes... sur le C.I." -#: pcbnew/menubarpcb.cpp:255 +#: pcbnew/menubarpcb.cpp:249 msgid "&List nets" msgstr "&Liste équipots" -#: pcbnew/menubarpcb.cpp:256 +#: pcbnew/menubarpcb.cpp:250 msgid "List nets (names and id)" msgstr "Lister équipotentielles (noms et numéros d'identification)" -#: pcbnew/menubarpcb.cpp:260 +#: pcbnew/menubarpcb.cpp:254 msgid "&Clean tracks" msgstr "&Nettoyage pistes" -#: pcbnew/menubarpcb.cpp:261 +#: pcbnew/menubarpcb.cpp:255 msgid "Clean stubs, vias, delete break points" msgstr "Nettoyer bouts de pistes, vias, points inutiles..." -#: pcbnew/menubarpcb.cpp:265 +#: pcbnew/menubarpcb.cpp:259 msgid "&Swap layers" msgstr "&Permutte couches" -#: pcbnew/menubarpcb.cpp:266 +#: pcbnew/menubarpcb.cpp:260 msgid "Swap tracks on copper layers or drawings on others layers" msgstr "Permutation de couches" -#: pcbnew/menubarpcb.cpp:274 +#: pcbnew/menubarpcb.cpp:268 #: pcbnew/menubarmodedit.cpp:60 -#: eeschema/menubar.cpp:180 +#: eeschema/menubar.cpp:173 #: cvpcb/tool_cvpcb.cpp:158 -#: kicad/buildmnu.cpp:199 -#: gerbview/tool_gerber.cpp:161 +#: kicad/buildmnu.cpp:198 +#: gerbview/tool_gerber.cpp:150 msgid "&Contents" msgstr "&Contenu" -#: pcbnew/menubarpcb.cpp:274 +#: pcbnew/menubarpcb.cpp:268 #: pcbnew/menubarmodedit.cpp:60 msgid "Open the pcbnew manual" msgstr "Ouvrir la documentation de pcbnew" -#: pcbnew/menubarpcb.cpp:278 +#: pcbnew/menubarpcb.cpp:272 #: pcbnew/menubarmodedit.cpp:64 -#: eeschema/menubar.cpp:185 +#: eeschema/menubar.cpp:178 #: cvpcb/tool_cvpcb.cpp:162 -#: kicad/buildmnu.cpp:204 -#: gerbview/tool_gerber.cpp:163 +#: kicad/buildmnu.cpp:203 +#: gerbview/tool_gerber.cpp:152 msgid "&About" msgstr "&Infos logiciel" -#: pcbnew/menubarpcb.cpp:278 +#: pcbnew/menubarpcb.cpp:272 #: pcbnew/menubarmodedit.cpp:64 -#: eeschema/menubar.cpp:185 +#: eeschema/menubar.cpp:178 #: cvpcb/tool_cvpcb.cpp:163 -#: kicad/buildmnu.cpp:204 -#: gerbview/tool_gerber.cpp:164 +#: kicad/buildmnu.cpp:203 +#: gerbview/tool_gerber.cpp:153 msgid "About this application" msgstr "Au sujet de cette application" -#: pcbnew/menubarpcb.cpp:286 +#: pcbnew/menubarpcb.cpp:280 #: pcbnew/menubarmodedit.cpp:72 msgid "3D Display" msgstr "3D Visu" -#: pcbnew/menubarpcb.cpp:286 +#: pcbnew/menubarpcb.cpp:280 #: pcbnew/menubarmodedit.cpp:72 msgid "Show Board in 3D Mode" msgstr "Visualisation en 3D" -#: pcbnew/menubarpcb.cpp:290 -#: eeschema/menubar.cpp:190 +#: pcbnew/menubarpcb.cpp:284 +#: eeschema/menubar.cpp:183 #: cvpcb/tool_cvpcb.cpp:167 -#: gerbview/tool_gerber.cpp:166 +#: gerbview/tool_gerber.cpp:155 #: 3d-viewer/3d_toolbar.cpp:111 msgid "&File" msgstr "&Fichiers" -#: pcbnew/menubarpcb.cpp:291 -#: eeschema/menubar.cpp:192 +#: pcbnew/menubarpcb.cpp:285 +#: eeschema/menubar.cpp:185 #: cvpcb/tool_cvpcb.cpp:168 -#: kicad/buildmnu.cpp:211 -#: gerbview/tool_gerber.cpp:167 +#: kicad/buildmnu.cpp:210 +#: gerbview/tool_gerber.cpp:156 #: 3d-viewer/3d_toolbar.cpp:119 msgid "&Preferences" msgstr "&Préférences" -#: pcbnew/menubarpcb.cpp:292 +#: pcbnew/menubarpcb.cpp:286 #: pcbnew/menubarmodedit.cpp:76 msgid "&Dimensions" msgstr "&Dimensions" -#: pcbnew/menubarpcb.cpp:293 -#: gerbview/tool_gerber.cpp:168 +#: pcbnew/menubarpcb.cpp:287 +#: gerbview/tool_gerber.cpp:157 msgid "&Miscellaneous" msgstr "&Divers" -#: pcbnew/menubarpcb.cpp:294 +#: pcbnew/menubarpcb.cpp:288 msgid "P&ostprocess" msgstr "P&ostprocesseurs" -#: pcbnew/menubarpcb.cpp:295 +#: pcbnew/menubarpcb.cpp:289 #: pcbnew/menubarmodedit.cpp:77 msgid "&3D Display" msgstr "&3D Visu" -#: pcbnew/menubarpcb.cpp:296 +#: pcbnew/menubarpcb.cpp:290 #: pcbnew/menubarmodedit.cpp:78 -#: eeschema/menubar.cpp:193 +#: eeschema/menubar.cpp:186 #: cvpcb/tool_cvpcb.cpp:169 -#: kicad/buildmnu.cpp:212 -#: gerbview/tool_gerber.cpp:171 +#: kicad/buildmnu.cpp:211 +#: gerbview/tool_gerber.cpp:160 msgid "&Help" msgstr "&Aide" @@ -5644,19 +5621,11 @@ msgstr "Choisir les couleurs d'affichage" msgid "&Options" msgstr "&Options" -#: eeschema/menubar.cpp:168 -msgid "Create Eeschema &Hotkey config file" -msgstr "Créer les fichiers configuration des &Hotkeys de Eeschema " - -#: eeschema/menubar.cpp:172 -msgid "Reread &Eeschema Hotkey config file" -msgstr "Relire les fichiers configuration des Hotkeys de &Eeschema " - -#: eeschema/menubar.cpp:180 +#: eeschema/menubar.cpp:173 msgid "Open the eeschema manual" msgstr "Ouvrir la documentation de eeschema" -#: eeschema/menubar.cpp:191 +#: eeschema/menubar.cpp:184 msgid "&Edit" msgstr "&Editer" @@ -5664,24 +5633,24 @@ msgstr "&Editer" msgid "Eeschema is already running, Continue?" msgstr "Eeschema est est cours d'exécution. Continuer ?" -#: eeschema/schframe.cpp:186 +#: eeschema/schframe.cpp:180 msgid "Schematic modified, Save before exit ?" msgstr "Schematique modifiée, Sauver avant de quitter ?" -#: eeschema/schframe.cpp:275 +#: eeschema/schframe.cpp:269 msgid "No show Hidden Pins" msgstr "N'affichage pas les pins invisibles" -#: eeschema/schframe.cpp:275 +#: eeschema/schframe.cpp:269 #: eeschema/tool_sch.cpp:274 msgid "Show Hidden Pins" msgstr "Force affichage des pins invisibles" -#: eeschema/schframe.cpp:278 +#: eeschema/schframe.cpp:272 msgid "Draw lines at any direction" msgstr "Tracer traits de direction quelconque" -#: eeschema/schframe.cpp:279 +#: eeschema/schframe.cpp:273 msgid "Draw lines H, V or 45 deg only" msgstr "Tracer traits H, V ou 45 deg seulement" @@ -5860,7 +5829,6 @@ msgid "List of Material" msgstr "Liste du Matériel" #: eeschema/genliste.cpp:123 -#, fuzzy msgid " List items: " msgstr " Liste éléments: " @@ -8500,150 +8468,150 @@ msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option" msgid "Prefered Editor:" msgstr "Editeur préféré:" -#: kicad/buildmnu.cpp:101 +#: kicad/buildmnu.cpp:100 msgid "&Open Project Descr" msgstr "&Ouvrir Descr de projet" -#: kicad/buildmnu.cpp:102 -#: kicad/buildmnu.cpp:257 +#: kicad/buildmnu.cpp:101 +#: kicad/buildmnu.cpp:256 msgid "Select an existing project descriptor" msgstr "Ouvrir un descripteur de projet existant" -#: kicad/buildmnu.cpp:107 +#: kicad/buildmnu.cpp:106 msgid "&New Project Descr" msgstr "&Nouveau descr de projet" -#: kicad/buildmnu.cpp:108 -#: kicad/buildmnu.cpp:252 +#: kicad/buildmnu.cpp:107 +#: kicad/buildmnu.cpp:251 msgid "Create new project descriptor" msgstr "Créer un nouveau descripteur de projet" -#: kicad/buildmnu.cpp:113 +#: kicad/buildmnu.cpp:112 msgid "&Save Project Descr" msgstr "&Sauver descr de projet" -#: kicad/buildmnu.cpp:114 -#: kicad/buildmnu.cpp:262 +#: kicad/buildmnu.cpp:113 +#: kicad/buildmnu.cpp:261 msgid "Save current project descriptor" msgstr "Sauver le descripteur de projet" -#: kicad/buildmnu.cpp:120 +#: kicad/buildmnu.cpp:119 msgid "Save &Project Files" msgstr "Sauver fichiers &Projet" -#: kicad/buildmnu.cpp:121 +#: kicad/buildmnu.cpp:120 msgid "Save and Zip all project files" msgstr "Compresser et sauver fichiers Projet" -#: kicad/buildmnu.cpp:125 +#: kicad/buildmnu.cpp:124 msgid "&Unzip Archive" msgstr "&Unzip Archive" -#: kicad/buildmnu.cpp:126 +#: kicad/buildmnu.cpp:125 msgid "UnZip archive file" msgstr "Décompresser fichier d'archive" -#: kicad/buildmnu.cpp:131 +#: kicad/buildmnu.cpp:130 msgid "Quit Kicad" msgstr "Quitter Kicad" -#: kicad/buildmnu.cpp:146 +#: kicad/buildmnu.cpp:145 msgid "&Editor" msgstr "&Editeur" -#: kicad/buildmnu.cpp:146 +#: kicad/buildmnu.cpp:145 msgid "Text editor" msgstr "Editeur de Texte" -#: kicad/buildmnu.cpp:150 +#: kicad/buildmnu.cpp:149 msgid "&Browse Files" msgstr "&Examen Fichiers" -#: kicad/buildmnu.cpp:150 +#: kicad/buildmnu.cpp:149 msgid "Read or edit files" msgstr "Lire ou Editer fichiers" -#: kicad/buildmnu.cpp:155 +#: kicad/buildmnu.cpp:154 msgid "&Select Editor" msgstr "&Sélection Editeur" -#: kicad/buildmnu.cpp:155 +#: kicad/buildmnu.cpp:154 msgid "Select your prefered editor for file browsing" msgstr "Choisir son pour examen de fichiers" -#: kicad/buildmnu.cpp:162 +#: kicad/buildmnu.cpp:161 msgid "Select Fonts" msgstr "Sélection Fontes" -#: kicad/buildmnu.cpp:162 +#: kicad/buildmnu.cpp:161 msgid "Select Fonts and Font sizes" msgstr "Selection fontes et tailles" -#: kicad/buildmnu.cpp:169 +#: kicad/buildmnu.cpp:168 msgid "Default Pdf Viewer" msgstr "Visualisateur PDF par défaut" -#: kicad/buildmnu.cpp:169 +#: kicad/buildmnu.cpp:168 msgid "Use the default (system) PDF viewer used to browse datasheets" msgstr "Utiliser le visualisateur PDF par défaut pour afficher les documentations" -#: kicad/buildmnu.cpp:176 +#: kicad/buildmnu.cpp:175 msgid "Favourite Pdf Viewer" msgstr "Visualisateur PDF préféré" -#: kicad/buildmnu.cpp:176 +#: kicad/buildmnu.cpp:175 msgid "Use your favourite PDF viewer used to browse datasheets" msgstr "\"Utiliser le visualisateur PDF préférét pour afficher les documentations" -#: kicad/buildmnu.cpp:184 +#: kicad/buildmnu.cpp:183 msgid "Select Pdf Viewer" msgstr "Sélection Visualisateur PDF" -#: kicad/buildmnu.cpp:184 +#: kicad/buildmnu.cpp:183 msgid "Select your favourite PDF viewer used to browse datasheets" msgstr "\"Sélectionner le visualisateur PDF favori pour afficher des documentations" -#: kicad/buildmnu.cpp:188 +#: kicad/buildmnu.cpp:187 msgid "Pdf Browser" msgstr "Visualisateur PDF" -#: kicad/buildmnu.cpp:199 +#: kicad/buildmnu.cpp:198 msgid "Open the kicad manual" msgstr "Ouvrir la documentation de kicad" -#: kicad/buildmnu.cpp:209 +#: kicad/buildmnu.cpp:208 msgid "&Projects" msgstr "&Projets" -#: kicad/buildmnu.cpp:210 +#: kicad/buildmnu.cpp:209 msgid "&Browse" msgstr "&Examiner" -#: kicad/buildmnu.cpp:268 +#: kicad/buildmnu.cpp:267 msgid "Archive all project files" msgstr "Archiver les fichiers du projet" -#: kicad/buildmnu.cpp:274 +#: kicad/buildmnu.cpp:273 msgid "Refresh project tree" msgstr "Mettre a jour l'affichage du projet" -#: kicad/buildmnu.cpp:291 +#: kicad/buildmnu.cpp:290 msgid "eeschema (Schematic editor)" msgstr "EeSchema (Editeur de Schématique)" -#: kicad/buildmnu.cpp:295 +#: kicad/buildmnu.cpp:294 msgid "cvpcb (Components to modules)" msgstr "Cvpcb ( Association Composants/ Modules)" -#: kicad/buildmnu.cpp:299 +#: kicad/buildmnu.cpp:298 msgid "pcbnew (PCB editor)" msgstr "Pcbnew (Editeur de circuits imprimés)" -#: kicad/buildmnu.cpp:303 +#: kicad/buildmnu.cpp:302 msgid "gerbview (Gerber viewer)" msgstr "GerbView (Visualisateur Gerber)" -#: kicad/buildmnu.cpp:311 +#: kicad/buildmnu.cpp:310 msgid "Run Python Script" msgstr "Exécuter le Script Python" @@ -8895,7 +8863,7 @@ msgid "GerbView is already running. Continue?" msgstr "Gerbview est est cours d'exécution. Continuer ?" #: gerbview/affiche.cpp:34 -#: gerbview/tool_gerber.cpp:322 +#: gerbview/tool_gerber.cpp:311 msgid "Layer " msgstr "Couche " @@ -9038,7 +9006,7 @@ msgstr "Suppression d' msgid "Layer modified, Continue ?" msgstr "Couche modifiée, Continuer ?" -#: gerbview/gerbview_config.cpp:116 +#: gerbview/gerbview_config.cpp:127 #: gerbview/process_config.cpp:117 msgid "Save config file" msgstr "Sauver config" @@ -9160,79 +9128,79 @@ msgstr " S msgid " Select how items are displayed" msgstr "Sélectionner comment les éléments sont a afficher" -#: gerbview/tool_gerber.cpp:151 +#: gerbview/tool_gerber.cpp:140 msgid "&List DCodes" msgstr "&Liste DCodes" -#: gerbview/tool_gerber.cpp:152 +#: gerbview/tool_gerber.cpp:141 msgid "List and Edit DCodes" msgstr "Lister et Editer DCodes" -#: gerbview/tool_gerber.cpp:153 +#: gerbview/tool_gerber.cpp:142 msgid "&Show source" msgstr "Monter source" -#: gerbview/tool_gerber.cpp:154 +#: gerbview/tool_gerber.cpp:143 msgid "Show source file for the current layer" msgstr "Monter fichier source pour la couche courante" -#: gerbview/tool_gerber.cpp:156 +#: gerbview/tool_gerber.cpp:145 msgid "&Delete Layer" msgstr "&Effacer couche" -#: gerbview/tool_gerber.cpp:157 +#: gerbview/tool_gerber.cpp:146 msgid "Delete current layer" msgstr "&Effacer couche active" -#: gerbview/tool_gerber.cpp:162 +#: gerbview/tool_gerber.cpp:151 msgid "Open the gerbview manual" msgstr "Ouvrir la documentation de gerbview" -#: gerbview/tool_gerber.cpp:226 +#: gerbview/tool_gerber.cpp:215 msgid "New World" msgstr "Nouvelle photo" -#: gerbview/tool_gerber.cpp:231 +#: gerbview/tool_gerber.cpp:220 msgid "Open existing Layer" msgstr "Ouvrir couche existante" -#: gerbview/tool_gerber.cpp:237 +#: gerbview/tool_gerber.cpp:226 msgid "Save World" msgstr "Sauver photo" -#: gerbview/tool_gerber.cpp:280 +#: gerbview/tool_gerber.cpp:269 msgid "Print World" msgstr "Imprimer photo" -#: gerbview/tool_gerber.cpp:315 +#: gerbview/tool_gerber.cpp:304 msgid "Find D Codes" msgstr "Chercher DCodes" -#: gerbview/tool_gerber.cpp:333 +#: gerbview/tool_gerber.cpp:322 msgid "No tool" msgstr "Ps d'outil" -#: gerbview/tool_gerber.cpp:337 +#: gerbview/tool_gerber.cpp:326 msgid "Tool " msgstr "Outil " -#: gerbview/tool_gerber.cpp:375 +#: gerbview/tool_gerber.cpp:364 msgid "Add Flashes" msgstr "Addition de Flash" -#: gerbview/tool_gerber.cpp:381 +#: gerbview/tool_gerber.cpp:370 msgid "Add Lines" msgstr "Addition de lignes" -#: gerbview/tool_gerber.cpp:451 +#: gerbview/tool_gerber.cpp:440 msgid "Show Spots Sketch" msgstr "Afficher flashs en contour" -#: gerbview/tool_gerber.cpp:458 +#: gerbview/tool_gerber.cpp:447 msgid "Show Lines Sketch" msgstr "Afficher lignes en contour" -#: gerbview/tool_gerber.cpp:465 +#: gerbview/tool_gerber.cpp:454 msgid "Show dcode number" msgstr "Afficher le n° de DCode" @@ -9373,51 +9341,51 @@ msgstr "--- " msgid "No default editor found, you must choose it" msgstr "Pas d'éditeur par défaut trouvé, vous devez en choisir un" -#: common/edaappl.cpp:456 +#: common/edaappl.cpp:457 msgid "Default" msgstr "Defaut" -#: common/edaappl.cpp:466 +#: common/edaappl.cpp:467 msgid "French" msgstr "French" -#: common/edaappl.cpp:471 +#: common/edaappl.cpp:472 msgid "Spanish" msgstr "Espagnol" -#: common/edaappl.cpp:476 +#: common/edaappl.cpp:477 msgid "Portuguese" msgstr "Portugais" -#: common/edaappl.cpp:482 +#: common/edaappl.cpp:483 msgid "Italian" msgstr "Italien" -#: common/edaappl.cpp:487 +#: common/edaappl.cpp:488 msgid "German" msgstr "Allemand" -#: common/edaappl.cpp:492 +#: common/edaappl.cpp:493 msgid "Slovenian" msgstr "Slovène" -#: common/edaappl.cpp:497 +#: common/edaappl.cpp:498 msgid "Hungarian" msgstr "Hongrois" -#: common/edaappl.cpp:502 +#: common/edaappl.cpp:503 msgid "Polish" msgstr "Polonais" -#: common/edaappl.cpp:507 +#: common/edaappl.cpp:508 msgid "Russian" msgstr "Russe" -#: common/edaappl.cpp:512 +#: common/edaappl.cpp:513 msgid "Korean" msgstr "Coréen" -#: common/edaappl.cpp:578 +#: common/edaappl.cpp:579 msgid "Language" msgstr "Langage" @@ -9532,7 +9500,7 @@ msgstr "Inversion Bloc" msgid "Block Mirror" msgstr "Bloc Miroir" -#: common/hotkeys_basic.cpp:297 +#: common/hotkeys_basic.cpp:300 msgid "" "Current hotkey list:\n" "\n" @@ -9540,23 +9508,71 @@ msgstr "" "Liste des Hotkeys courantes:\n" "\n" -#: common/hotkeys_basic.cpp:305 +#: common/hotkeys_basic.cpp:308 msgid "key " msgstr "touche: " -#: common/hotkeys_basic.cpp:362 -#: common/hotkeys_basic.cpp:480 +#: common/hotkeys_basic.cpp:365 +#: common/hotkeys_basic.cpp:483 msgid "Hotkey configuration file:" msgstr "Fichier configuration des Hotkeys:" -#: common/hotkeys_basic.cpp:394 +#: common/hotkeys_basic.cpp:397 msgid "Allowed keys:\n" msgstr "Touches autorisées:\n" -#: common/hotkeys_basic.cpp:499 +#: common/hotkeys_basic.cpp:502 msgid "Unable to read " msgstr "Impossible de lire " +#: common/hotkeys_basic.cpp:609 +msgid "Create Hotkey config file" +msgstr "Créer le fichiers configuration des Hotkeys" + +#: common/hotkeys_basic.cpp:610 +msgid "Create or Recreate the hotkey config file from current hotkey list" +msgstr "Créer ou recréer les fichiers configuration des Hotkeys a partir de la liste courante" + +#: common/hotkeys_basic.cpp:614 +msgid "Reread Hotkey config file" +msgstr "Relire les fichiers configuration des Hotkeys" + +#: common/hotkeys_basic.cpp:615 +msgid "Reread the hotkey config file" +msgstr "Relire les fichiers configuration des Hotkeys" + +#: common/hotkeys_basic.cpp:619 +msgid "Edit Hotkey config file" +msgstr "Editer le fichiers configuration des Hotkeys" + +#: common/hotkeys_basic.cpp:620 +msgid "Run the text editor and edit the hotkey config file" +msgstr "Lancer l'éditeur de texte et éditer le fichier de config des hotkeys" + +#: common/hotkeys_basic.cpp:626 +msgid "home directory" +msgstr "Répertoire d'accueil (home)" + +#: common/hotkeys_basic.cpp:627 +msgid "Use home directory to load or store Hotkey config files" +msgstr "Utiliser le répertoire d'accueil pour charger ou sauver les fichiers de config des Hotkeys" + +#: common/hotkeys_basic.cpp:632 +msgid "kicad/template directory" +msgstr "kicad/template directory" + +#: common/hotkeys_basic.cpp:633 +msgid "Use kicad/templatedirectory to load or store Hotkey config files" +msgstr "Utiliser kicad/templatedirectory pour charger ou sauver les fichiers de config des Hotkeys" + +#: common/hotkeys_basic.cpp:639 +msgid "Hotkey config location" +msgstr "Emplacement des Fichiers des Hotkeys" + +#: common/hotkeys_basic.cpp:640 +msgid "Hotkey config file location selection (home directory or kicad tree)" +msgstr "Selection emplacement des fichiers de config. des hotkeys(\"home\" ou répertoire kicad)" + #: common/get_component_dialog.cpp:105 msgid "History list:" msgstr "Historique:" diff --git a/pcbnew/pcbcfg.cpp b/pcbnew/pcbcfg.cpp index 0d7b9acd55..67ac94e77e 100644 --- a/pcbnew/pcbcfg.cpp +++ b/pcbnew/pcbcfg.cpp @@ -107,13 +107,8 @@ wxString FullFileName; } case ID_PREFERENCES_HOTKEY_PATH_IS_HOME: - g_ConfigFileLocationChoice = 0; - m_Parent->m_EDA_CommonConfig->Write(HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice); - break; - case ID_PREFERENCES_HOTKEY_PATH_IS_KICAD: - g_ConfigFileLocationChoice = 1; - m_Parent->m_EDA_CommonConfig->Write(HOTKEY_CFG_PATH_OPT, g_ConfigFileLocationChoice); + HandleHotheyConfigMenuSelection( this, id ); break; default: