From 46e70e675dc7e961696c92cd20cd674f9f144d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Wed, 31 Mar 2010 19:07:04 +0400 Subject: [PATCH] Added removal of unused localizations. --- Change.log | 1 + install/calculate | 72 +++++++++++++++----- install/i18n/ru_RU/LC_MESSAGES/calculate.mo | Bin 32704 -> 32812 bytes install/i18n/ru_RU/LC_MESSAGES/calculate.po | 5 +- 4 files changed, 59 insertions(+), 19 deletions(-) diff --git a/Change.log b/Change.log index c4700c3..b8c6869 100644 --- a/Change.log +++ b/Change.log @@ -15,6 +15,7 @@ CHANGE LOG * Added acpid daemon for laptop and livecd. * Added support backlight and eject keys for Sony Vaio. * Added xdm patch for nox boot parameter. +* Added removal of unused localizations. 1.3.9 * Add change partition id for system installation. diff --git a/install/calculate b/install/calculate index deac260..9a3a30f 100755 --- a/install/calculate +++ b/install/calculate @@ -1436,16 +1436,19 @@ sub checksystem{ #---------------------------------------------------------------------- #system: locale, keymap, dumpkeys_charset, consolefont, consoletranslation, xkblayout #KDE: kb_groups, kb_layout, country, language, dictionary + #system: langdir my %lang = ( #Belarussian 'be_BY' => ["be_BY.UTF-8", "by", "koi8-u", "Cyr_a8x16", "", "us,by", - "by(winkeys):us", "us,by(winkeys)", "by", "ru", "ru"], + "by(winkeys):us", "us,by(winkeys)", "by", "ru", "ru", + "ru"], #Belgian 'fr_BE' => ["fr_BE.UTF-8", "be-latin1", "", "lat9w-16", "", "us,be", "", "us,be", "be", "en_US", "en"], #Brazilian Portuguese 'pt_BR' => ["pt_BR.UTF-8", "br-abnt2", "", "lat9w-16", "", "pt,us", - "", "us,pt", "br", "pt_BR", "en"], + "", "us,pt", "br", "pt_BR", "en", + "pt-BR"], #Canadian French 'fr_CA' => ["fr_CA.UTF-8", "cf", "", "default8x16", "8859-1_to_uni", "us,ca_enhanced", "", "us,ca(fr)", "ca", "en_US", "en"], @@ -1454,34 +1457,41 @@ sub checksystem{ "", "us,dk", "dk", "da", "da"], #French 'fr_FR' => ["fr_FR.UTF-8", "fr-latin9", "", "lat0-16", "", "fr,us", - "", "us,fr(latin9)", "fr", "en_US", "en"], + "", "us,fr(latin9)", "fr", "en_US", "en", + "fr"], #German 'de_DE' => ["de_DE.UTF-8", "de-latin1", "", "lat9w-16", "", "de,us", - "", "us,de", "de", "de", "de"], + "", "us,de", "de", "de", "de", + "de"], #Icelandic 'is_IS' => ["is_IS.UTF-8", "is-latin1", "", "cp850-8x16", "8859-1_to_uni", "us,is", "", "us,is", "is", "en_US", "en"], #Italian 'it_IT' => ["it_IT.UTF-8", "it", "", "default8x16", "8859-15_to_uni", "us,it", - "", "us,it", "it", "it", "it"], + "", "us,it", "it", "it", "it", + "it"], #Norwegian 'nn_NO' => ["nn_NO.UTF-8", "no-latin1", "", "lat9w-16", "", "us,no", "", "us,no", "no", "nn", "en"], #Polish 'pl_PL' => ["pl_PL.UTF-8", "pl", "", "lat2-16", "8859-2_to_uni", "us,pl", - "", "us,pl", "pl", "pl", "pl"], + "", "us,pl", "pl", "pl", "pl", + "pl"], #Russian 'ru_RU' => ["ru_RU.UTF-8", "-u ruwin_cplk-UTF-8", "", "ter-k14n", "", "us,ru(winkeys)", - "ru(winkeys):us", "us,ru(winkeys)", "ru", "ru", "en"], + "ru(winkeys):us", "us,ru(winkeys)", "ru", "ru", "en", + "ru"], #Spanish 'es_ES' => ["es_ES.UTF-8", "es euro2", "", "lat0-16", "", "es,us", - "", "us,es", "es", "es", "es"], + "", "us,es", "es", "es", "es", + "es"], #Swedish 'sv_SE' => ["sv_SE.UTF-8", "sv-latin1", "", "lat0-16", "", "us,se", "", "us,se", "se", "sv", "sv"], #Ukrainian 'uk_UA' => ["uk_UA.UTF-8", "ua-utf", "koi8-u", "ter-v14n", "", "us,ua", - "ua(winkeys):us", "us,ua(winkeys)", "ua", "uk", "uk"], + "ua(winkeys):us", "us,ua(winkeys)", "ua", "uk", "uk", + "uk"], #United Kingdom/British 'en_GB' => ["en_GB.UTF-8", "uk", "", "LatArCyrHeb-16", "", "us,gb", "", "us,gb", "gb", "en_US", "en_GB"], @@ -1563,6 +1573,12 @@ sub checksystem{ $data{'country'}, ) = @{$lang{$changekb}}[1..8]; + #неиспользуемые языки + foreach(sort keys %lang){ + if($lang{$_}[11] ne $data{language} && $lang{$_}[11]){ + push(@{$data{clearlang}}, $lang{$_}[10]); + } } + printmes(" ".gettext('Language')); printmes(": $data{lang}\n"); printmes(" ".gettext('Keymap')); printmes(": $changekb\n"); @@ -3537,16 +3553,13 @@ sub setup{ } } #---------------------------------------------------------------------- - # Перенесем статистику preload + # Удалим файлы неиспользуемых локализаций #---------------------------------------------------------------------- - #{ - # my $state = "/var/lib/preload"; - # if(-e $state){ - # printmes(" ".gettext('Copy preload state')); printmes("..."); - # system "$data{path} mkdir -p $data{'chroot'}$data{scratch_ws}$state"; - # system "$data{path} cp -a $state/preload.state $data{'chroot'}$data{scratch_ws}$state"; - # printmes(" ".gettext('done').".\n"); - #} } + { + printmes(" ".gettext('Remove unused localization')); printmes("..."); + clearlang(); + printmes(" ".gettext('done').".\n"); + } #---------------------------------------------------------------------- # Сохраним диск, с которого произвелась установка @@ -7146,3 +7159,26 @@ sub uuid{ return $info; } +#------------------------------------------------------------------------------ +# Удалим файлы не используемую локализацию +#------------------------------------------------------------------------------ +sub clearlang{ + my @remote; + + foreach( + @{$data{clearlang}} + ){ + my $lang = $_; + foreach( + '/usr/lib/openoffice', + '/usr/share/apps', + '/usr/share/doc', + '/usr/share/locale', + '/usr/share/man', + '/usr/share/vim' + ){ + foreach(`find $data{'chroot'}$_ -type d -name $lang`){ + chomp; + system "rm -rf $_"; +} } } } + diff --git a/install/i18n/ru_RU/LC_MESSAGES/calculate.mo b/install/i18n/ru_RU/LC_MESSAGES/calculate.mo index f795a63afed0454ed664587ccbdeb4f24d39bae8..e777065e7e8b1b8412c562e3af79b51d4181bbac 100644 GIT binary patch delta 6786 zcmYk=30PKD9>?(mVu%PR2*@TVyC}Q+0*HIoXezm+1}>!;Zc%FLi%Vq_O;hiZ|~npxIMBzi<8t4j)!qu3KyD$^4 zUWH`{thY=+tCMqL_O#%YGzso z4KxxXF&#CL-gqC5L@mu&bg84+6m;PlRBCrSeu3)v2j~1vR7asKusTY^Ak0Qx*VSOW#G1|*RGdDP`kSiYBLW)4SWPDBU4Zltw1gDYL|1O8rcS>2D9-pW?@2-olz0$Etrhz zU^b@VBGiLFKt1RfYPVlNEoD>IS7snhCLiy^$4~=wl~T~Id)o zQg<3zB@;wNnaM_N(q53O z8K{93qON-swdqPxGn^WRVtxP=*d|C_e3YyTi>M$?dg z<}dtU70edYz)qqbco{W7Z}Q&;ldwJxM?LUyjKf)|`&OX#$OgwxQP-WpaGr1OP|yrR zTiRWljat(J%)`N`nJ>X%xCS)??^ed}&m{6g4;X+N;6zj=%2AtcDQXEeqCaj!W%eU< zY14g8Ar5b$I*LxW9kfFYYyfIcOhR8=i0WWD*1<|t$~PieHTzLB{}nY5AHKU9NGvwN z_NaayQvQ|Vp)@qWa*V^5(GTB2b+j3S@Br$%R~MJo-Ry5?S;NL5=*cMKS0eWBFBEJb5R)@jmpp*R7TdI zHrqN3#!AOMjz>^Se9lEdOW>7jAJ_~v{dZRk%=d_PP-B^YVu>zBDIfmdK)O|-W z4o_krn%34JRK}X3GU;kbK{IHN`VJJKZYV=#Vm>M}Z=yC)C2DD^QQwE%s1MRU)ZRIP z8o*7|bzW_3#{5xBmW0Yw9`YQQ8BIYMn2LIh+^CLLU=Q4iWZihRwFAsWZKeUJ`<}$c z__E_F45wa=n!x9%CA)$eKp-1L8BN9rz5g93sDptRhU1)iIVuwiF%(y$ZrqCM@F2$F z8B`|x+8e{0X#!E1>WFGDK=soDmFYpK=S|Uho^M`oE~r4wd@06ZHEL~-qHeg0TD!&_ z?0eiC`5K#a)az7)TGJ7z)IWi`z6`x_9!BExsLZTH?LV`Zg4Xy3YQ)|h?E`&L1Bym{ zaN40BGz^vEQK+?k79(*krr>f^#`a+ZeuL?F4Os<~*vUR;cqj6&k(SV)kxxJ^!E{vn zUop?im^V-}J>J=VlD)gw-JgQ&Gt(abgcGq4-^amNCy!;oM^H0ff_yT}c8tcK^IZ0? zR=<3^`O;7WX@mL$qY$I87}dcnWDI5{s)LiLf!#)RoKRo~HV|{EkHG=>2A1GOEX4j@ z?XT&DE(&_!K4f{#m#Ezyz*VW3kJN`u8uYSD(+4%7a^#<>;)gz5w~-9FOaRlMZ_^bufEO_l_hKxbM}9#X|33EDa$DpX zrUaF_b*KSWqh|Ugwm@^g{hg48MO24iJ=}oWGh48}-v3J!_`P6mqHauM`pvKiQ*atK zz?G;qeg`#!6R2N0mr!dQ^MJj7GR9M1hI%V@p(gS*CgUw+8<_Y9`3CTOGls%sJcyMZy-k#|WC9D;h#EDXoj zu`O0&0-nWm3><3hjGFKS?1g163j8xW`B91y!|Vtbpx%mgsHM5=w6}T0K6o&;p?xOi zV-+f;zhP7K9c~AbgqraPWOYnAYCvD1Cg7?w!giF5n&Ajc#ebk?egNm-Eo_CeM)F@r zxE@>MkVlPq3SYsF=u>Pnl#j~92-GHCgxai!QJFf0X?p+fP+;Gg)Dqj_vyPRRPy0`( zj#Eb2571}~qy8Rd<0q&+@&{@!1dX;C?S##!FUADig6ii4YBNTT(S59cAqAy+AnJyt z*d2FZ1lAeLACwq_Q8*N1@o8+2i%>K2U}rpo+-i~@vu{lWPNKdGwb!y9=c|dusNX;4 zI|@&D@mU>bJE|DZe~!_<8a3kRCwNzJFfPDTsI@PhU_aIWLaphqsP<-0+P7seDpOBl z63$0bZq}og_z1dMQSf5tJ%kykj^<)KR-!i5A=He|puS-BCfcRSL}hF&_QVC4h#u7I zdJVM){F#0_7CKHr^|Nvk`PYL!ra>Q+3)l;rOtz^m#ysk?P#x~TNc;lT!3AuBp;K(8 z(ost?9yRdQsPomBfgV(UW~v=<{#5d>HC;eM0j|b4JdK)}FI$^Qm{jbGucJOdr?Dkw zmDx2Pf$gX-L#6f*=Hp!~#Qdl20Oz9yxC>M8ri+476wiWdZHA#z^@8IjjG=xC^}ssQ z?0_>dmwI0uh;y(39!71xADnvc>Gp$Dgv#7V%)%L{iMZaP;6veejKJHd%@Q`l4x}^o zral2RkWHv1`^u?bM=e>{v(5uBocat5!PiikT!VVfepIFpBAIcSpqcgyHvj`Uu>`et zYf&@YimmYy=40Y4JJYe4O?|3UUxNdvS0OKm@#P)M(Rmz-YjF^Iv*gOyU<}l*c$DCyA`+*zUFeqT~rNc3>`4~+`&;nJqMoa3Z> zdT4yzFDP|$uMCZERfqOYwP*P9V+!^AaD&sB@?TGL+R*JdHw-gT z$2np=(cG!OOSwO>i)cn95IWwnxJ-_7q4q{I%GxuZ5y_O#U{A~@qKFmLzbAep{HW_2 zQXjv;uZe4fjv(4nFak?)B%#;$CgDq)Hr^qK(n35;K}VoYaQtAY{Zp+Q<&TJ;-On{i za}_#Q?59QlW52a?Wh~`Wls_lhQaeaU8Ed?EuHf^ zK4K>I|L5Hq5fQG#wDqO!D0V0AC)N>r2^~EwCZB5xh^5pYCDu6Yp?HiqLEO*zK~B5J zQFNtUM*`O1RpJ54?fBmaA4N3s3UD8bC`|lHmvDq}=2QHDc!6k7y)JgbR_=nxkklWk z{hN57c#5bd(g+=QiC>8l;#>Eu$f)6MxNi|P9p036Y_rt-D?4I4UHj7uVf;q*Je? zA&$s%zZ#Vs5kkv6YMqH_;zOb#ZD-vzQQ=;}RcE8R1&5A_D=RIVI%ag-go&eyCybj> z{M5LKrB%u4ZwC73WW{B*>yXnXEiDg9O;i;~fN6Yq_ empmKeJlkm8>e+ysJ=LBKHP7Sbs%<58WBv#G$32z+ delta 6697 zcmYk=30PKD9>?*63JM}BJG?5dAe$(@fFj@ms3?&-VxpG0V3uY@E~Q!4tt_%4n|xg+ z$!xT-G%X3MXB-=~)NC=eTw5HKrZUZ3+SJVX{y6t}#`|>moOABIXZfFVF4($IG4%^~y*c5|#*o&>O17>1J9D<2>H^$&X z)O%}D&uvD!FkfQ0F^>6`j2gU%E$|Aq!l3rXgkdCxViKmJ58L2qRKvF;4Vec}16_cO z(JaDj+<-o8z-}1HDB^GcwxEAAj!Xg-lTi&lfzh}Oqp;2`e}EB`k0N6<=TSjw&CBYr z6RKQHldhH0aPz_X~B5@C@gGb%+i>OGf!)CZ2 z)zJ~u%+8_)8p3+SV+Yhk@-Ybif?Ar9=%}G8GJ0?cDztU3@1Yw0+`az;s-Zv@SPglw zH725-%XYmEHINBz`F_+upF>S_3AV)gMB=ZGw@{%GeSvEDJgWX8YE2`P?2O{EIps`L z2y;=98G#zWG}L=fp!Uv6R7Z90{dX~q@_y`&SCWW-5t-~x#-!s+)Bu(v&zP4{Gv0+7 z`BBsWE@M+{nrsKq95sL>)b1`oZRQfxQVc~!WFl&!b5TpY$Z>DHf@}k`4YTn$W?^KC zozXzlDX2s>P=y&-jq3PKR7W48cKg?;r3_DkIPy=+vktd8h#lM1}k&9E7)FAinO_Z*leU!|{WW0C^)lg`r9Z(u-FO*<&oQisJ25R?LqeA@@5>2xlHRBIZ12}>jz|R&G8I&KaUureJXAx^U~61~dhQKWLz}S`9ze!y8ZZyr`fRxj%PHT7 zTB?t*6wjbeLC-8>7UQ@q;@^VI&s6BaE2urtkux|Rd*Vo3iki_Gq%RYkV@qGG6%!4+Vy$Yb*QD?f{Oe>J*WGE^jPL`CL7)aI#1ElmyTyRZcHA*w~~ znR?U!_Mo0Sh>F-T)RJ9BMJh7a_LGl9z%iv{bbO|u8k&g%@mVC=<{)Z-!9DF}N<)RN zA4cLt*V!0Dxdt_Xmr(=Qg&IHuDx!a&Hf3uzOr*|#I+Dj zYj+ZLet$#0zNTq`Jx&>@HO)bVz6kYv88*Su7>{F6k(q^TH?s^Kt?{R1G?PQ94!=ST z=p5=p)2f&4$cHhM^H6I&4C8SWrr``!#A-1P>o5~PMxt&mq58@0Z3o)3w|oAJsn8M( zb#L5?g#r8#iJIvfee4J05Nh{dLH3gg>&ss=H~{o}k-kh;p`GzvsAKyaw!>}M z5swx+cJrAc8^V^TKP+O=gSn`X4M+Mkvrr9eL=9{os^N>Mfu$GQKP(FH2FiEiM0_7L zz?6RW*Yi}=lGQq7SWfdQYPX-jbd2I@?SVqnvAGRZ|1@5QZz225T*X0{H^AP17!~rh zs7-kUZ^WPy+s_2#8)ufGBISHSMxjdP%nim$)Ed8zioi}(h)joH`Jo8y!|r$jY0@z}g$kLqAMYK_mM-XA!`?v?4NQ?VE|kqwxNdy#Eme#aSDFw~go^l#Ra8HEYNSuf7U zLR^U26Q3cEn80CnCL=J6@>o>J@5Dr0i#m3@F&4i=O+>#6b^Ow?3s#~Av;ZCUhk2U} z+rV7LN-Q4EhQn2;4@C&m49C8xnU*8_&dfzcY%8YV31sNh53{RnEk~`AQqzaQL*P;fn1+^!>#YeFTVGYH{ zQ3G9wip)mrhPy`*f8Dr3g*IOTXM(ILK_4#1V*C`_V;jzrI?P0MG#q2F3VUKTcEW#S zCN{W+-(+W8jHT35)W9=rbKn-XOY66E*?Kpps(F}9O*$>FQsF|<8M{qB8#o^=GsQ57Uz|0B! z!xSfBFFb+ z4dYRJVd^$d#AGF zxsit&@dm8H(>NdJ++o+M$({BSosU|}YSbFOg*qjtQIQI`%btci9&!yL9BQWr zCgE7@jE_ts{-tErQK3-(f(lXF>9)agjHi4Xs)0u^7T2I6^&Vr)PVP+`e`@QZu-2Lj{U86KNXr;Ei!2HE)K@7Z1FO@AG_cV)S92iJoMdbLwh?G zQTAhh+>aVy>?}LL5tv4K0V+c8pqAz*hm1nyVFSoA)G?Za>ToG)#M`ku9>WnBb)WsR zO+{_K*>3r3Y(e=4ROBvT7KY8S6Dh)Gl%K{pbpA>vh0I#i0QMojahb9mNEvF)rnu!A z)RL{mc)Wly81{huhe!%4k_D)aZpLD)L`7y54#4j)Oy|GLT)TF?P%|8gJ#Zct;Xg4H zFJU$|f6$f-@CM3*kON|BF-P|~Yd2vptiUCxh@D0{G{r1=1P;R(ZSzTFbUfywLb4hI zP>uiO4~)tQ{)3#lKJ71#iV6OV++tFRzcR|xswt1Q*W+AA{ZB?E1@0r)-(MG%)U^rq zy&LZs!-g=al!I`CTbEBc(0%tqe?WAEbDdjKWRH_Hp7%+~Zv8>>x;l_rldh1~la`WR zB~2zRBI%0bowsl~sUOKhnZ-3N@hmoX+azv{pOOD+1L%}B&R%jgCv7JEPV$i+C)JR~ zl6w2MMW<$E(u~$k2l@@tN|LU0>a`Q2-EI~(*0PTNxEN3SHg4?^YP*w9aLamVm%ltF z!Rbs5OV;=yI**T$ej`Ov|0KRfYDRuA>Ux2+m2?Y98@ea=#$Y$pb&|vf)pT^rZ;~%3 zZBZSm6G_)Pi(|6g2emi6sAQ)Z?O~$NPM(R+W+tS3*+LP z1Jqql-61Sdp0t*-y*TOWmoNnex7xL@Jc?{O8yZl6iGm-5e~ z!Q}J!@*aw78xZP08P`Agb3Mux#hs6F8|evB9_2vng;JnaH7=Z* zd6fE)+L7KPwWjWS|8Y-DK->C@o&n+Yqcc~Awam`(`tl2U_%eJs^?`lPCfDcQ@@u>Q E0goLIMF0Q* diff --git a/install/i18n/ru_RU/LC_MESSAGES/calculate.po b/install/i18n/ru_RU/LC_MESSAGES/calculate.po index d366e4b..6526ae0 100644 --- a/install/i18n/ru_RU/LC_MESSAGES/calculate.po +++ b/install/i18n/ru_RU/LC_MESSAGES/calculate.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: support.ru\n" -"POT-Creation-Date: 2010-03-23 09:50+0300\n" +"POT-Creation-Date: 2010-03-31 18:36+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -594,6 +594,9 @@ msgstr "Пропишем ядро в автозагрузку" msgid "Remove the user from groups" msgstr "Удалим пользователя из групп" +msgid "Remove unused localization" +msgstr "Удалим неиспользуемые локализации" + msgid "Removing old image of system" msgstr "Удалим предыдущий образ системы"