Changeset 2299 for trunk

Timestamp:

2001-04-10T12:14:24+12:00 (23 years ago)

Author:

sjboddie

Message:

Removed a bunch of _width_ macros from language macro files as they're
no longer used.

Location:

trunk/gsdl

Files:

• bin/script/translate.pl (modified) (2 diffs)
• macros/arabic.dm (modified) ( previous)
• macros/chinese.dm (modified) ( previous)
• macros/dutch.dm (modified) (17 diffs)
• macros/english.dm (modified) (18 diffs)
• macros/french.dm (modified) (13 diffs)
• macros/german.dm (modified) (19 diffs)
• macros/maori.dm (modified) (1 diff)
• macros/port.dm (modified) (13 diffs)
• macros/pref.dm (modified) (1 diff)
• macros/russian.dm (modified) (27 diffs)
• macros/russian2.dm (modified) (1 diff)
• macros/spanish.dm (modified) (13 diffs)

trunk/gsdl/bin/script/translate.pl

@@ -211 +211 @@
 
     # get width of new images and edit width macro
-    my $fullfilename = &util::filename_cat ($image_dir, "${image_name}on.gif");
-    &process_width_macro ($fullfilename, $image_name, \$image_macros);
+    # my $fullfilename = &util::filename_cat ($image_dir, "${image_name}on.gif");
+    # &process_width_macro ($fullfilename, $image_name, \$image_macros);
 
     } elsif ($image_type eq "nav_bar_button") {
@@ -250 +250 @@
 
     # get width of new images and edit width macro
-    my $fullfilename = &util::filename_cat ($image_dir, "${image_name}on.gif");
-    &process_width_macro ($fullfilename, $image_name, \$image_macros);
+    # my $fullfilename = &util::filename_cat ($image_dir, "${image_name}on.gif");
+    # &process_width_macro ($fullfilename, $image_name, \$image_macros);
 
     } elsif ($image_type eq "green_bar_left_aligned") {

trunk/gsdl/macros/dutch.dm

@@ -143 +143 @@
 _httpiconchomeof_ [l=nl] {_httpimg_/nl/chomeof.gif}
 _httpiconchomeon_ [l=nl] {_httpimg_/nl/chomeon.gif}
-_widthchomex_ [l=nl] {92}
-_heightchomex_ [l=nl] {20}
 
 ## "HELP" ## top_nav_button ## chelp ##
 _httpiconchelpof_ [l=nl] {_httpimg_/nl/chelpof.gif}
 _httpiconchelpon_ [l=nl] {_httpimg_/nl/chelpon.gif}
-_widthchelpx_ [l=nl] {32}
-_heightchelpx_ [l=nl] {20}
 
 ## "PREFERENTIES" ## top_nav_button ## cpref ##
 _httpiconcprefof_ [l=nl] {_httpimg_/nl/cprefof.gif}
 _httpiconcprefon_ [l=nl] {_httpimg_/nl/cprefon.gif}
-_widthcprefx_ [l=nl] {85}
-_heightcprefx_ [l=nl] {20}
 
 ## "help" ## green_title ## h_help ##
@@ -168 +162 @@
 _httpicontauthon_ [l=nl] {_httpimg_/nl/tauthon.gif}
 _widthtauthx_ [l=nl] {100}
-_heighttauthx_ [l=nl] {17}
 
 ## "reksen" ## nav_bar_button ## tser ##
@@ -175 +168 @@
 _httpicontseron_ [l=nl] {_httpimg_/nl/tseron.gif}
 _widthtserx_ [l=nl] {87}
-_heighttserx_ [l=nl] {17}
 
 ## "datums" ## nav_bar_button ## tdate ##
@@ -182 +174 @@
 _httpicontdateon_ [l=nl] {_httpimg_/nl/tdateon.gif}
 _widthtdatex_ [l=nl] {87}
-_heighttdatex_ [l=nl] {17}
 
 ## "onderwerpen" ## nav_bar_button ## tsubj ##
@@ -189 +180 @@
 _httpicontsubjof_ [l=nl] {_httpimg_/nl/tsubjof.gif}
 _widthtsubjx_ [l=nl] {110}
-_heighttsubjx_ [l=nl] {17}
 
 ## "geadresseerde" ## nav_bar_button ## tto ##
@@ -196 +186 @@
 _httpiconttoof_ [l=nl] {_httpimg_/nl/ttoof.gif}
 _widthttox_ [l=nl] {122}
-_heightttox_ [l=nl] {17}
 
 ## "afzender" ## nav_bar_button ## tfrom ##
@@ -203 +192 @@
 _httpicontfromof_ [l=nl] {_httpimg_/nl/tfromof.gif}
 _widthtfromx_ [l=nl] {87}
-_heighttfromx_ [l=nl] {17}
 
 ## "organisatie" ## nav_bar_button ## torg ##
@@ -210 +198 @@
 _httpicontorgof_ [l=nl] {_httpimg_/nl/torgof.gif}
 _widthtorgx_ [l=nl] {94}
-_heighttorgx_ [l=nl] {17}
 
 ## "help onderwerpen" ## nav_bar_button ## thow ##
@@ -217 +204 @@
 _httpiconthowof_ [l=nl] {_httpimg_/nl/thowof.gif}
 _widththowx_ [l=nl] {151}
-_heightthowx_ [l=nl] {17}
 
 ## "thema" ## nav_bar_button ## ttopic ##
@@ -224 +210 @@
 _httpiconttopicof_ [l=nl] {_httpimg_/nl/ttopicof.gif}
 _widthttopicx_ [l=nl] {87}
-_heightttopicx_ [l=nl] {17}
 
 ## "browsen" ## nav_bar_button ## tbrwse ##
@@ -231 +216 @@
 _httpicontbrwseof_ [l=nl] {_httpimg_/nl/tbrwseof.gif}
 _widthtbrwsex_ [l=nl] {87}
-_heighttbrwsex_ [l=nl] {17}
 
 ## "zoeken" ## nav_bar_button ## tsrch ##
@@ -238 +222 @@
 _httpicontsrchon_ [l=nl] {_httpimg_/nl/tsrchon.gif}
 _widthtsrchx_ [l=nl] {87}
-_heighttsrchx_ [l=nl] {17}
 
 ## "titels a-z" ## nav_bar_button ## ttitl ##
@@ -245 +228 @@
 _httpiconttitlon_ [l=nl] {_httpimg_/nl/ttitlon.gif}
 _widthttitlx_ [l=nl] {87}
-_heightttitlx_ [l=nl] {17}
 
 ## "personen" ## nav_bar_button ## tpeop ##
@@ -252 +234 @@
 _httpicontpeopon_ [l=nl] {_httpimg_/nl/tpeopon.gif}
 _widthtpeopx_ [l=nl] {87}
-_heighttpeopx_ [l=nl] {17}
 
 ## "taal" ## nav_bar_button ## tlang ##
@@ -259 +240 @@
 _httpicontlangof_ [l=nl] {_httpimg_/nl/tlangof.gif}
 _widthtlangx_ [l=nl] {87}
-_heighttlangx_ [l=nl] {17}
 
 ## "afkortingen" ## nav_bar_button ## tacro ##
@@ -266 +246 @@
 _httpicontacroon_ [l=nl] {_httpimg_/nl/tacroon.gif}
 _widthtacrox_ [l=nl] {98}
-_heighttacrox_ [l=nl] {17}
-
-
-
 
 
@@ -451 +427 @@
 _httpiconcontoff_ [l=nl] {_httpimg_/nl/contoff.gif}
 _httpiconconton_ [l=nl] {_httpimg_/nl/conton.gif}
-_widthcontx_ [l=nl] {97}
-_heightcontx_ [l=nl] {17}
 
 ## "     TEKST
-UITBREIDEN" ## document_button ## eallt ## 
+#UITBREIDEN" ## document_button ## eallt ## 
 _httpiconealltof_ [l=nl] {_httpimg_/nl/ealltof.gif}
 _httpiconeallton_ [l=nl] {_httpimg_/nl/eallton.gif}
-_widthealltx_ [l=nl] {65}
-_heightealltx_ [l=nl] {30}
 
 ## "  INHOUD
-INKRIMPEN" ## document_button ## econc ##
+#INKRIMPEN" ## document_button ## econc ##
 _httpiconeconcof_ [l=nl] {_httpimg_/nl/econcof.gif}
 _httpiconeconcon_ [l=nl] {_httpimg_/nl/econcon.gif}
-_widtheconcx_ [l=nl] {65}
-_heighteconcx_ [l=nl] {30}
 
 ## "  NIEUW
-VENSTER" ## document_button ## edtch ##
+#VENSTER" ## document_button ## edtch ##
 _httpiconedtchof_ [l=nl] {_httpimg_/nl/edtchof.gif}
 _httpiconedtchon_ [l=nl] {_httpimg_/nl/edtchon.gif}
-_widthedtchx_ [l=nl] {65}
-_heightedtchx_ [l=nl] {30}
 
 ## "  INHOUD 
-UITBREIDEN" ## document_button ## eexpc ##
+#UITBREIDEN" ## document_button ## eexpc ##
 _httpiconeexpcof_ [l=nl] {_httpimg_/nl/eexpcof.gif}
 _httpiconeexpcon_ [l=nl] {_httpimg_/nl/eexpcon.gif}
-_widtheexpcx_ [l=nl] {65}
-_heighteexpcx_ [l=nl] {30}
 
 ## "   TEKST
-INKRIMPEN" ## document_button ## etsec ##
+#INKRIMPEN" ## document_button ## etsec ##
 _httpiconetsecof_ [l=nl] {_httpimg_/nl/etsecof.gif}
 _httpiconetsecon_ [l=nl] {_httpimg_/nl/etsecon.gif}
-_widthetsecx_ [l=nl] {65}
-_heightetsecx_ [l=nl] {30}
 
 ## "ACCENTUEREN" ## document_button ## ehl ##
 _httpiconehlof_ [l=nl] {_httpimg_/nl/ehlof.gif}
 _httpiconehlon_ [l=nl] {_httpimg_/nl/ehlon.gif}
-_widthehlx_ [l=nl] {74}
-_heightehlx_ [l=nl] {30}
 
 ## "        NIET
-ACCENTUEREN" ## document_button ## enhl ##
+#ACCENTUEREN" ## document_button ## enhl ##
 _httpiconenhlof_ [l=nl] {_httpimg_/nl/enhlof.gif}
 _httpiconenhlon_ [l=nl] {_httpimg_/nl/enhlon.gif}
-_widthenhlx_ [l=nl] {74}
-_heightenhlx_ [l=nl] {30}
-
 
 

trunk/gsdl/macros/english.dm

@@ -149 +149 @@
 _httpiconchomeof_ {_httpimg_/chomeof.gif}
 _httpiconchomeon_ {_httpimg_/chomeon.gif}
-_widthchomex_ {43}
-_heightchomex_ {20}
 
 ## "HELP" ## top_nav_button ## chelp ##
 _httpiconchelpof_ {_httpimg_/chelpof.gif}
 _httpiconchelpon_ {_httpimg_/chelpon.gif}
-_widthchelpx_ {36}
-_heightchelpx_ {20}
 
 ## "PREFERENCES" ## top_nav_button ## cpref ##
 _httpiconcprefof_ {_httpimg_/cprefof.gif}
 _httpiconcprefon_ {_httpimg_/cprefon.gif}
-_widthcprefx_ {87}
-_heightcprefx_ {20}
 
 ## "help" ## green_title ## h_help ##
@@ -174 +168 @@
 _httpicontauthon_ {_httpimg_/tauthon.gif}
 _widthtauthx_ {110}
-_heighttauthx_ {17}
 
 ## "series" ## nav_bar_button ## tser ##
@@ -181 +174 @@
 _httpicontseron_ {_httpimg_/tseron.gif}
 _widthtserx_ {87}
-_heighttserx_ {17}
 
 ## "dates" ## nav_bar_button ## tdate ##
@@ -188 +180 @@
 _httpicontdateon_ {_httpimg_/tdateon.gif}
 _widthtdatex_ {87}
-_heighttdatex_ {17}
 
 ## "subjects" ## nav_bar_button ## tsubj ##
@@ -195 +186 @@
 _httpicontsubjof_ {_httpimg_/tsubjof.gif}
 _widthtsubjx_ {87}
-_heighttsubjx_ {17}
 
 ## "to" ## nav_bar_button ## tto ##
@@ -202 +192 @@
 _httpiconttoof_ {_httpimg_/ttoof.gif}
 _widthttox_ {87}
-_heightttox_ {17}
 
 ## "from" ## nav_bar_button ## tfrom ##
@@ -209 +198 @@
 _httpicontfromof_ {_httpimg_/tfromof.gif}
 _widthtfromx_ {87}
-_heighttfromx_ {17}
 
 ## "organization" ## nav_bar_button ## torg ##
@@ -216 +204 @@
 _httpicontorgof_{_httpimg_/torgof.gif}
 _widthtorgx_ {109}
-_heighttorgx_ {17}
 
 ## "how to" ## nav_bar_button ## thow ##
@@ -223 +210 @@
 _httpiconthowof_{_httpimg_/thowof.gif}
 _widththowx_ {87}
-_heightthowx_ {17}
 
 ## "topic" ## nav_bar_button ## ttopic ##
@@ -230 +216 @@
 _httpiconttopicof_{_httpimg_/ttopicof.gif}
 _widthttopicx_ {87}
-_heightttopicx_ {17}
 
 ## "browse" ## nav_bar_button ## tbrwse ##
@@ -237 +222 @@
 _httpicontbrwseof_{_httpimg_/tbrwseof.gif}
 _widthtbrwsex_ {87}
-_heighttbrwsex_ {17}
 
 ## "search" ## nav_bar_button ## tsrch ##
@@ -244 +228 @@
 _httpicontsrchon_ {_httpimg_/tsrchon.gif}
 _widthtsrchx_ {87}
-_heighttsrchx_ {17}
 
 ## "titles a-z" ## nav_bar_button ## ttitl ##
@@ -251 +234 @@
 _httpiconttitlon_ {_httpimg_/ttitlon.gif}
 _widthttitlx_ {87}
-_heightttitlx_ {17}
 
 ## "people" ## nav_bar_button ## tpeop ##
@@ -258 +240 @@
 _httpicontpeopon_ {_httpimg_/tpeopon.gif}
 _widthtpeopx_ {97}
-_heighttpeopx_ {17}
 
 ## "language" ## nav_bar_button ## tlang ##
@@ -265 +246 @@
 _httpicontlangof_ {_httpimg_/tlangof.gif}
 _widthtlangx_ {87}
-_heighttlangx_ {17}
 
 ## "acronym" ## nav_bar_button ## tacro ##
@@ -272 +252 @@
 _httpicontacroon_ {_httpimg_/tacroon.gif}
 _widthtacrox_ {87}
-_heighttacrox_ {17}
 
 ## "phrases" ## nav_bar_button ## tphrse ##
@@ -279 +258 @@
 _httpicontphrseon_ {_httpimg_/tphrseon.gif}
 _widthtphrsex_ {87}
-_heighttphrsex_ {17}
 
 
@@ -467 +445 @@
 _httpiconcontoff_ {_httpimg_/contoff.gif}
 _httpiconconton_ {_httpimg_/conton.gif}
-_widthcontx_ {76}
-_heightcontx_ {17}
 
 ## "EXPAND TEXT" ## document_button ## eallt ## 
 _httpiconealltof_ {_httpimg_/ealltof.gif}
 _httpiconeallton_ {_httpimg_/eallton.gif}
-_widthealltx_ {65}
-_heightealltx_ {30}
 
 ## "CONTRACT CONTENTS" ## document_button ## econc ##
 _httpiconeconcof_ {_httpimg_/econcof.gif}
 _httpiconeconcon_ {_httpimg_/econcon.gif}
-_widtheconcx_ {65}
-_heighteconcx_ {30}
 
 ## "DETACH" ## document_button ## edtch ##
 _httpiconedtchof_ {_httpimg_/edtchof.gif}
 _httpiconedtchon_ {_httpimg_/edtchon.gif}
-_widthedtchx_ {65}
-_heightedtchx_ {30}
 
 ## "EXPAND CONTENTS" ## document_button ## eexpc ##
 _httpiconeexpcof_ {_httpimg_/eexpcof.gif}
 _httpiconeexpcon_ {_httpimg_/eexpcon.gif}
-_widtheexpcx_ {65}
-_heighteexpcx_ {30}
 
 ## "CONTRACT TEXT" ## document_button ## etsec ##
 _httpiconetsecof_ {_httpimg_/etsecof.gif}
 _httpiconetsecon_ {_httpimg_/etsecon.gif}
-_widthetsecx_ {65}
-_heightetsecx_ {30}
 
 ## "HIGHLIGHTING" ## document_button ## ehl ##
 _httpiconehlof_ {_httpimg_/ehlof.gif}
 _httpiconehlon_ {_httpimg_/ehlon.gif}
-_widthehlx_ {65}
-_heightehlx_ {30}
 
 ## "NO HIGHLIGHTING" ## document_button ## enhl ##
 _httpiconenhlof_ {_httpimg_/enhlof.gif}
 _httpiconenhlon_ {_httpimg_/enhlon.gif}
-_widthenhlx_ {65}
-_heightenhlx_ {30}
-
 
 

trunk/gsdl/macros/french.dm

@@ -86 +86 @@
 _httpiconchomeof_ [l=fr] {_httpimg_/fr/chomeof.gif}
 _httpiconchomeon_ [l=fr] {_httpimg_/fr/chomeon.gif}
-_widthchomex_ [l=fr] {72}
-_heightchomex_ [l=fr] {20}
 
 ## "AIDE" ## top_nav_button ## chelp ##
 _httpiconchelpof_ [l=fr] {_httpimg_/fr/chelpof.gif}
 _httpiconchelpon_ [l=fr] {_httpimg_/fr/chelpon.gif}
-_widthchelpx_ [l=fr] {32}
-_heightchelpx_ [l=fr] {20}
 
 ## "PREFERENCES" ## top_nav_button ## cpref ##
 _httpiconcprefof_ [l=fr] {_httpimg_/fr/cprefof.gif}
 _httpiconcprefon_ [l=fr] {_httpimg_/fr/cprefon.gif}
-_widthcprefx_ [l=fr] {83}
-_heightcprefx_ [l=fr] {20}
 
 ## "aide" ## green_title ## h_help ##
@@ -111 +105 @@
 _httpicontauthon_ [l=fr] {_httpimg_/fr/tauthon.gif}
 _widthtauthx_ [l=fr] {100}
-_heighttauthx_ [l=fr] {17}
 
 ## "series" ## nav_bar_button ## tser ##
@@ -118 +111 @@
 _httpicontseron_ [l=fr] {_httpimg_/fr/tseron.gif}
 _widthtserx_ [l=fr] {87}
-_heighttserx_ [l=fr] {17}
 
 ## "dates" ## nav_bar_button ## tdate ##
@@ -125 +117 @@
 _httpicontdateon_ [l=fr] {_httpimg_/fr/tdateon.gif}
 _widthtdatex_ [l=fr] {87}
-_heighttdatex_ [l=fr] {17}
 
 ## "sujets" ## nav_bar_button ## tsubj ##
@@ -132 +123 @@
 _httpicontsubjof_ [l=fr] {_httpimg_/fr/tsubjof.gif}
 _widthtsubjx_ [l=fr] {87}
-_heighttsubjx_ [l=fr] {17}
 
 ## "organisation" ## nav_bar_button ## torg ##
@@ -139 +129 @@
 _httpicontorgof_ [l=fr] {_httpimg_/fr/torgof.gif}
 _widthtorgx_ [l=fr] {105}
-_heighttorgx_ [l=fr] {17}
 
 ## "comment faire" ## nav_bar_button ## thow ##
@@ -146 +135 @@
 _httpiconthowof_ [l=fr] {_httpimg_/fr/thowof.gif}
 _widththowx_ [l=fr] {122}
-_heightthowx_ [l=fr] {17}
 
 ## "theme" ## nav_bar_button ## ttopic ##
@@ -153 +141 @@
 _httpiconttopicof_ [l=fr] {_httpimg_/fr/ttopicof.gif}
 _widthttopicx_ [l=fr] {87}
-_heightttopicx_ [l=fr] {17}
 
 ## "naviguer" ## nav_bar_button ## tbrwse ##
@@ -160 +147 @@
 _httpicontbrwseof_ [l=fr] {_httpimg_/fr/tbrwseof.gif}
 _widthtbrwsex_ [l=fr] {87}
-_heighttbrwsex_ [l=fr] {17}
 
 ## "rechercher" ## nav_bar_button ## tsrch ##
@@ -167 +153 @@
 _httpicontsrchon_ [l=fr] {_httpimg_/fr/tsrchon.gif}
 _widthtsrchx_ [l=fr] {90}
-_heighttsrchx_ [l=fr] {17}
 
 ## "titres a-z" ## nav_bar_button ## ttitl ##
@@ -174 +159 @@
 _httpiconttitlon_ [l=fr] {_httpimg_/fr/ttitlon.gif}
 _widthttitlx_ [l=fr] {87}
-_heightttitlx_ [l=fr] {17}
 
 ## "personnes" ## nav_bar_button ## tpeop ##
@@ -181 +165 @@
 _httpicontpeopon_ [l=fr] {_httpimg/tpeopon.gif}
 _widthtpeopx_ [l=fr] {87}
-_heighttpeopx_ [l=fr] {17}
-
 
 
@@ -335 +317 @@
 _httpiconcontoff_ [l=fr] {_httpimg_/fr/contoff.gif}
 _httpiconconton_ [l=fr] {_httpimg_/fr/conton.gif}
-_widthcontx_ [l=fr] {72}
-_heightcontx_ [l=fr] {17}
 
 ## "ETENDRE LE TEXTE" ## document_button ## eallt ## 
 _httpiconealltof_ [l=fr] {_httpimg_/fr/ealltof.gif}
 _httpiconeallton_ [l=fr] {_httpimg_/fr/eallton.gif}
-_widthealltx_ [l=fr] {92}
-_heightealltx_ [l=fr] {30}
 
 ## "CONTRACT CONTENTS" ## document_button ## econc ##
 _httpiconeconcof_ [l=fr] {_httpimg_/fr/econcof.gif}
 _httpiconeconcon_ [l=fr] {_httpimg_/fr/econcon.gif}
-_widtheconcx_ [l=fr] {113}
-_heighteconcx_ [l=fr] {30}
 
 ## "DETACH" ## document_button ## edtch ##
 _httpiconedtchof_ [l=fr] {_httpimg_/fr/edtchof.gif}
 _httpiconedtchon_ [l=fr] {_httpimg_/fr/edtchon.gif}
-_widthedtchx_ [l=fr] {65}
-_heightedtchx_ [l=fr] {30}
 
 ## "ETENDRE LE CONTENU" ## document_button ## eexpc ##
 _httpiconeexpcof_ [l=fr] {_httpimg_/fr/eexpcof.gif}
 _httpiconeexpcon_ [l=fr] {_httpimg_/fr/eexpcon.gif}
-_widtheexpcx_ [l=fr] {110}
-_heighteexpcx_ [l=fr] {30}
 
 ## "CONTRACT TEXT" ## document_button ## etsec ##
 _httpiconetsecof_ [l=fr] {_httpimg_/fr/etsecof.gif}
 _httpiconetsecon_ [l=fr] {_httpimg_/fr/etsecon.gif}
-_widthetsecx_ [l=fr] {85}
-_heightetsecx_ [l=fr] {30}
 
 ## "METTRE EN EVIDENCE" ## document_button ## ehl ##
 _httpiconehlof_ [l=fr] {_httpimg_/fr/ehlof.gif}
 _httpiconehlon_ [l=fr] {_httpimg_/fr/ehlon.gif}
-_widthehlx_ [l=fr] {106}
-_heightehlx_ [l=fr] {30}
 
 ## "NE PAS METTRE EN EVIDENCE" ## document_button ## enhl ##
 _httpiconenhlof_ [l=fr] {_httpimg_/fr/enhlof.gif}
 _httpiconenhlon_ [l=fr] {_httpimg_/fr/enhlon.gif}
-_widthenhlx_ [l=fr] {142}
-_heightenhlx_ [l=fr] {30}
-
 
 

trunk/gsdl/macros/german.dm

@@ -128 +128 @@
 _httpiconchomeof_ [l=de] {_httpimg_/de/chomeof.gif}
 _httpiconchomeon_ [l=de] {_httpimg_/de/chomeon.gif}
-_widthchomex_ [l=de] {75}
-_heightchomex_ [l=de] {20}
 
 ## "HILFE" ## top_nav_button ## chelp ##
 _httpiconchelpof_ [l=de] {_httpimg_/de/chelpof.gif}
 _httpiconchelpon_ [l=de] {_httpimg_/de/chelpon.gif}
-_widthchelpx_ [l=de] {36}
-_heightchelpx_ [l=de] {20}
 
 ## "VOREINSTELLUNGEN" ## top_nav_button ## cpref ##
 _httpiconcprefof_ [l=de] {_httpimg_/de/cprefof.gif}
 _httpiconcprefon_ [l=de] {_httpimg_/de/cprefon.gif}
-_widthcprefx_ [l=de] {124}
-_heightcprefx_ [l=de] {20}
 
 ## "hilfe" ## green_title ## h_help ##
@@ -153 +147 @@
 _httpicontauthon_ [l=de] {_httpimg_/de/tauthon.gif}
 _widthtauthx_ [l=de] {102}
-_heighttauthx_ [l=de] {17}
 
 ## "serien" ## nav_bar_button ## tser ##
@@ -160 +153 @@
 _httpicontseron_ [l=de] {_httpimg_/de/tseron.gif}
 _widthtserx_ [l=de] {87}
-_heighttserx_ [l=de] {17}
 
 ## "daten" ## nav_bar_button ## tdate ##
@@ -167 +159 @@
 _httpicontdateon_ [l=de] {_httpimg_/de/tdateon.gif}
 _widthtdatex_ [l=de] {87}
-_heighttdatex_ [l=de] {17}
 
 ## "sparten" ## nav_bar_button ## tsubj ##
@@ -174 +165 @@
 _httpicontsubjof_ [l=de] {_httpimg_/de/tsubjof.gif}
 _widthtsubjx_ [l=de] {87}
-_heighttsubjx_ [l=de] {17}
 
 ## "organisation" ## nav_bar_button ## torg ##
@@ -181 +171 @@
 _httpicontorgof_ [l=de] {_httpimg_/de/torgof.gif}
 _widthtorgx_ [l=de] {105}
-_heighttorgx_ [l=de] {17}
 
 ## "wie geht das?" ## nav_bar_button ## thow ##
@@ -188 +177 @@
 _httpiconthowof_ [l=de] {_httpimg_/de/thowof.gif}
 _widththowx_ [l=de] {115}
-_heightthowx_ [l=de] {17}
 
 ## "thema" ## nav_bar_button ## ttopic ##
@@ -195 +183 @@
 _httpiconttopicof_ [l=de] {_httpimg_/de/ttopicof.gif}
 _widthttopicx_ [l=de] {87}
-_heightttopicx_ [l=de] {17}
 
 ## "stöbern" ## nav_bar_button ## tbrwse ##
@@ -202 +189 @@
 _httpicontbrwseof_ [l=de] {_httpimg_/de/tbrwseof.gif}
 _widthtbrwsex_ [l=de] {87}
-_heighttbrwsex_ [l=de] {17}
 
 ## "suche" ## nav_bar_button ## tsrch ##
@@ -209 +195 @@
 _httpicontsrchon_ [l=de] {_httpimg_/de/tsrchon.gif}
 _widthtsrchx_ [l=de] {87}
-_heighttsrchx_ [l=de] {17}
 
 ## "titel a-z" ## nav_bar_button ## ttitl ##
@@ -216 +201 @@
 _httpiconttitlon_ [l=de] {_httpimg_/de/ttitlon.gif}
 _widthttitlx_ [l=de] {87}
-_heightttitlx_ [l=de] {17}
 
 ## "personen" ## nav_bar_button ## tpeop ##
@@ -223 +207 @@
 _httpicontpeopon_ [l=de] {_httpimg_/de/tpeopon.gif}
 _widthtpeopx_ [l=de] {87}
-_heighttpeopx_ [l=de] {17}
-
 
 
@@ -376 +358 @@
 _httpiconcontoff_ [l=de] {_httpimg_/de/contoff.gif}
 _httpiconconton_ [l=de] {_httpimg_/de/conton.gif}
-_widthcontx_ [l=de] {104}
-_heightcontx_ [l=de] {17}
 
 ## "EXPANDIEREN
@@ -383 +363 @@
 _httpiconealltof_ [l=de] {_httpimg_/de/ealltof.gif}
 _httpiconeallton_ [l=de] {_httpimg_/de/eallton.gif}
-_widthealltx_ [l=de] {65}
-_heightealltx_ [l=de] {30}
 
 ## "KONTRAKTIONDES
@@ -390 +368 @@
 _httpiconeconcof_ [l=de] {_httpimg_/de/econcof.gif}
 _httpiconeconcon_ [l=de] {_httpimg_/de/econcon.gif}
-_widtheconcx_ [l=de] {92}
-_heighteconcx_ [l=de] {30}
 
 ## "SEPARATES
@@ -397 +373 @@
 _httpiconedtchof_ [l=de] {_httpimg_/de/edtchof.gif}
 _httpiconedtchon_ [l=de] {_httpimg_/de/edtchon.gif}
-_widthedtchx_ [l=de] {65}
-_heightedtchx_ [l=de] {30}
 
 ## "EXPANDIEREN
@@ -404 +378 @@
 _httpiconeexpcof_ [l=de] {_httpimg_/de/eexpcof.gif}
 _httpiconeexpcon_ [l=de] {_httpimg_/de/eexpcon.gif}
-_widtheexpcx_ [l=de] {65}
-_heighteexpcx_ [l=de] {30}
 
 ## "KONTRAKTION
@@ -411 +383 @@
 _httpiconetsecof_ [l=de] {_httpimg_/de/etsecof.gif}
 _httpiconetsecon_ [l=de] {_httpimg_/de/etsecon.gif}
-_widthetsecx_ [l=de] {74}
-_heightetsecx_ [l=de] {30}
 
 ## "HERVORHEBUNG" ## document_button ## ehl ##
 _httpiconehlof_ [l=de] {_httpimg_/de/ehlof.gif}
 _httpiconehlon_ [l=de] {_httpimg_/de/ehlon.gif}
-_widthehlx_ [l=de] {81}
-_heightehlx_ [l=de] {30}
 
 ## "         KEINE
@@ -424 +392 @@
 _httpiconenhlof_ [l=de] {_httpimg_/de/enhlof.gif}
 _httpiconenhlon_ [l=de] {_httpimg_/de/enhlon.gif}
-_widthenhlx_ [l=de] {81}
-_heightenhlx_ [l=de] {30}
-
 
 

trunk/gsdl/macros/maori.dm

@@ -70 +70 @@
 _httpiconchomeof_ [l=mi] {_httpimg_/mi/chomeof.gif}
 _httpiconchomeon_ [l=mi] {_httpimg_/mi/chomeon.gif}
-_widthchomex_ [l=mi] {54}
 
 _httpiconchelpof_ [l=mi] {_httpimg_/mi/chelpof.gif}
 _httpiconchelpon_ [l=mi] {_httpimg_/mi/chelpon.gif}
-_widthchelpx_ [l=mi] {57}
 
 _httpiconcprefof_ [l=mi] {_httpimg_/mi/cprefof.gif}
 _httpiconcprefon_ [l=mi] {_httpimg_/mi/cprefon.gif}
-_widthcprefx_ [l=mi] {103}
 
 _httpicontsergr_ [l=mi] {_httpimg_/mi/tsergr.gif}

trunk/gsdl/macros/port.dm

@@ -97 +97 @@
 _httpiconchomeof_ [l=pt] {_httpimg_/pt/chomeof.gif}
 _httpiconchomeon_ [l=pt] {_httpimg_/pt/chomeon.gif}
-_widthchomex_ [l=pt] {65}
-_heightchomex_ [l=pt] {20}
 
 ## "AJUDA" ## top_nav_button ## chelp ##
 _httpiconchelpof_ [l=pt] {_httpimg_/pt/chelpof.gif}
 _httpiconchelpon_ [l=pt] {_httpimg_/pt/chelpon.gif}
-_widthchelpx_ [l=pt] {43}
-_heightchelpx_ [l=pt] {20}
 
 ## "PREFERÊNCIAS" ## top_nav_button ## cpref ##
 _httpiconcprefof_ [l=pt] {_httpimg_/pt/cprefof.gif}
 _httpiconcprefon_ [l=pt] {_httpimg_/pt/cprefon.gif}
-_widthcprefx_ [l=pt] {88}
-_heightcprefx_ [l=pt] {20}
 
 ## "ajuda" ## green_title ## h_help ##
@@ -122 +116 @@
 _httpicontauthon_ [l=pt] {_httpimg_/pt/tauthon.gif}
 _widthtauthx_ [l=pt] {100}
-_heighttauthx_ [l=pt] {17}
 
 ## "séries" ## nav_bar_button ## tser ##
@@ -129 +122 @@
 _httpicontseron_ [l=pt] {_httpimg_/pt/tseron.gif}
 _widthtserx_ [l=pt] {87}
-_heighttserx_ [l=pt] {17}
 
 ## "datas" ## nav_bar_button ## tdate ##
@@ -136 +128 @@
 _httpicontdateon_ [l=pt] {_httpimg_/pt/tdateon.gif}
 _widthtdatex_ [l=pt] {87}
-_heighttdatex_ [l=pt] {17}
 
 ## "assuntos" ## nav_bar_button ## tsubj ##
@@ -143 +134 @@
 _httpicontsubjof_ [l=pt] {_httpimg_/pt/tsubjof.gif}
 _widthtsubjx_ [l=pt] {87}
-_heighttsubjx_ [l=pt] {17}
 
 ## "organização" ## nav_bar_button ## torg ##
@@ -150 +140 @@
 _httpicontorgof_ [l=pt] {_httpimg_/pt/torgof.gif}
 _widthtorgx_ [l=pt] {102}
-_heighttorgx_ [l=pt] {17}
 
 ## "como fazer" ## nav_bar_button ## thow ##
@@ -157 +146 @@
 _httpiconthowof_ [l=pt] {_httpimg_/pt/thowof.gif}
 _widththowx_ [l=pt] {95}
-_heightthowx_ [l=pt] {17}
 
 ## "tópico" ## nav_bar_button ## ttopic ##
@@ -164 +152 @@
 _httpiconttopicof_ [l=pt] {_httpimg_/pt/ttopicof.gif}
 _widthttopicx_ [l=pt] {87}
-_heightttopicx_ [l=pt] {17}
 
 ## "listar" ## nav_bar_button ## tbrwse ##
@@ -171 +158 @@
 _httpicontbrwseof_ [l=pt] {_httpimg_/pt/tbrwseof.gif}
 _widthtbrwsex_ [l=pt] {87}
-_heighttbrwsex_ [l=pt] {17}
 
 ## "buscar" ## nav_bar_button ## tsrch ##
@@ -178 +164 @@
 _httpicontsrchon_ [l=pt] {_httpimg_/pt/tsrchon.gif}
 _widthtsrchx_ [l=pt] {87}
-_heighttsrchx_ [l=pt] {17}
 
 ## "títulos a-z" ## nav_bar_button ## ttitl ##
@@ -185 +170 @@
 _httpiconttitlon_ [l=pt] {_httpimg_/pt/ttitlon.gif}
 _widthttitlx_ [l=pt] {90}
-_heightttitlx_ [l=pt] {17}
 
 ## "pessoas" ## nav_bar_button ## tpeop ##
@@ -192 +176 @@
 _httpicontpeopon_ [l=pt] {_httpimg_/pt/tpeopon.gif}
 _widthtpeopx_ [l=pt] {87}
-_heighttpeopx_ [l=pt] {17}
-
 
 
@@ -345 +327 @@
 _httpiconcontoff_ [l=pt] {_httpimg_/pt/contoff.gif}
 _httpiconconton_ [l=pt] {_httpimg_/pt/conton.gif}
-_widthcontx_ [l=pt] {81}
-_heightcontx_ [l=pt] {17}
 
 ## "AMPLIAR
-  TEXTO" ## document_button ## eallt ## 
+#  TEXTO" ## document_button ## eallt ## 
 _httpiconealltof_ [l=pt] {_httpimg_/pt/ealltof.gif}
 _httpiconeallton_ [l=pt] {_httpimg_/pt/eallton.gif}
-_widthealltx_ [l=pt] {65}
-_heightealltx_ [l=pt] {30}
 
 ## " ABREVIAR
-CONTEÚDO" ## document_button ## econc ##
+#CONTEÚDO" ## document_button ## econc ##
 _httpiconeconcof_ [l=pt] {_httpimg_/pt/econcof.gif}
 _httpiconeconcon_ [l=pt] {_httpimg_/pt/econcon.gif}
-_widtheconcx_ [l=pt] {65}
-_heighteconcx_ [l=pt] {30}
 
 ## "RESUMIR" ## document_button ## edtch ##
 _httpiconedtchof_ [l=pt] {_httpimg_/pt/edtchof.gif}
 _httpiconedtchon_ [l=pt] {_httpimg_/pt/edtchon.gif}
-_widthedtchx_ [l=pt] {65}
-_heightedtchx_ [l=pt] {30}
 
 ## "  AMPLIAR
-CONTEÚDO" ## document_button ## eexpc ##
+#CONTEÚDO" ## document_button ## eexpc ##
 _httpiconeexpcof_ [l=pt] {_httpimg_/pt/eexpcof.gif}
 _httpiconeexpcon_ [l=pt] {_httpimg_/pt/eexpcon.gif}
-_widtheexpcx_ [l=pt] {65}
-_heighteexpcx_ [l=pt] {30}
 
 ## "ABREVIAR
-   TEXTO" ## document_button ## etsec ##
+#   TEXTO" ## document_button ## etsec ##
 _httpiconetsecof_ [l=pt] {_httpimg_/pt/etsecof.gif}
 _httpiconetsecon_ [l=pt] {_httpimg_/pt/etsecon.gif}
-_widthetsecx_ [l=pt] {65}
-_heightetsecx_ [l=pt] {30}
 
 ## "DESTACAR" ## document_button ## ehl ##
 _httpiconehlof_ [l=pt] {_httpimg_/pt/ehlof.gif}
 _httpiconehlon_ [l=pt] {_httpimg_/pt/ehlon.gif}
-_widthehlx_ [l=pt] {65}
-_heightehlx_ [l=pt] {30}
 
 ## "     NÃO
-DESTACAR" ## document_button ## enhl ##
+#DESTACAR" ## document_button ## enhl ##
 _httpiconenhlof_ [l=pt] {_httpimg_/pt/enhlof.gif}
 _httpiconenhlon_ [l=pt] {_httpimg_/pt/enhlon.gif}
-_widthenhlx_ [l=pt] {65}
-_heightenhlx_ [l=pt] {30}
-
 
 

trunk/gsdl/macros/pref.dm

@@ -447 +447 @@
 <tr>_searchhistoryop_</tr>
 
+<!--
+Don't include this for now
 <tr>_relateddocop_</tr>
+-->
 
 <tr><td colspan=2>_textprefop_</td></tr>

trunk/gsdl/macros/russian.dm

@@ -77 +77 @@
 _textmonth01_ [l=ru] {ЯМварь}
 _textmonth02_ [l=ru] {Ѐевраль}
-
 _textmonth03_ [l=ru] {Март}
 _textmonth04_ [l=ru] {Апрель}
@@ -108 +107 @@
 _httpiconchomeof_ [l=ru] {_httpimg_/ru/chomeof.gif}
 _httpiconchomeon_ [l=ru] {_httpimg_/ru/chomeon.gif}
-_widthchomex_ [l=ru] {57}
-_heightchomex_ [l=ru] {20}
 
 ## "ПОМОЩЬ" ## top_nav_button ## chelp ##
 _httpiconchelpof_ [l=ru] {_httpimg_/ru/chelpof.gif}
 _httpiconchelpon_ [l=ru] {_httpimg_/ru/chelpon.gif}
-_widthchelpx_ [l=ru] {64}
-_heightchelpx_ [l=ru] {20}
 
 ## "НАСТРОЙКИ" ## top_nav_button ## cpref ##
 _httpiconcprefof_ [l=ru] {_httpimg_/ru/cprefof.gif}
 _httpiconcprefon_ [l=ru] {_httpimg_/ru/cprefon.gif}
-_widthcprefx_ [l=ru] {84}
-_heightcprefx_ [l=ru] {20}
 
 ## "пПЌПщь" ## green_title ## h_help ##
@@ -132 +125 @@
 _httpicontauthof_ [l=ru] {_httpimg_/ru/tauthof.gif}
 _httpicontauthon_ [l=ru] {_httpimg_/ru/tauthon.gif}
-_widthtauthx_ [l=ru] {115}
-_heighttauthx_ [l=ru] {17}
+_widthtauthx_ [l=ru] {110}
 
 ## "выпускО" ## nav_bar_button ## tser ##
@@ -140 +132 @@
 _httpicontseron_ [l=ru] {_httpimg_/ru/tseron.gif}
 _widthtserx_ [l=ru] {87}
-_heighttserx_ [l=ru] {17}
 
 ## "Ўаты" ## nav_bar_button ## tdate ##
@@ -147 +138 @@
 _httpicontdateon_ [l=ru] {_httpimg_/ru/tdateon.gif}
 _widthtdatex_ [l=ru] {87}
-_heighttdatex_ [l=ru] {17}
 
 ## "указатель" ## nav_bar_button ## tsubj ##
@@ -153 +143 @@
 _httpicontsubjon_ [l=ru] {_httpimg_/ru/tsubjon.gif}
 _httpicontsubjof_ [l=ru] {_httpimg_/ru/tsubjof.gif}
-_widthtsubjx_ [l=ru] {107}
-_heighttsubjx_ [l=ru] {17}
+_widthtsubjx_ [l=ru] {87}
 
 ## "кПЌу" ## nav_bar_button ## tto ##
@@ -161 +150 @@
 _httpiconttoof_ [l=ru] {_httpimg_/ru/ttoof.gif}
 _widthttox_ [l=ru] {87}
-_heightttox_ [l=ru] {17}
 
 ## "Пт кПгП" ## nav_bar_button ## tfrom ##
@@ -168 +156 @@
 _httpicontfromof_ [l=ru] {_httpimg_/ru/tfromof.gif}
 _widthtfromx_ [l=ru] {87}
-_heighttfromx_ [l=ru] {17}
 
 ## "ПргаМОзацОО" ## nav_bar_button ## torg ##
@@ -174 +161 @@
 _httpicontorgon_ [l=ru] {_httpimg_/ru/torgon.gif}
 _httpicontorgof_ [l=ru] {_httpimg_/ru/torgof.gif}
-
-_widthtorgx_ [l=ru] {135}
-_heighttorgx_ [l=ru] {17}
+_widthtorgx_ [l=ru] {109}
 
 ## "спПсПбы" ## nav_bar_button ## thow ##
@@ -183 +168 @@
 _httpiconthowof_ [l=ru] {_httpimg_/ru/thowof.gif}
 _widththowx_ [l=ru] {87}
-_heightthowx_ [l=ru] {17}
 
 ## "теЌы" ## nav_bar_button ## ttopic ##
@@ -190 +174 @@
 _httpiconttopicof_ [l=ru] {_httpimg_/ru/ttopicof.gif}
 _widthttopicx_ [l=ru] {87}
-_heightttopicx_ [l=ru] {17}
 
 ## "спОсПк" ## nav_bar_button ## tbrwse ##
@@ -197 +180 @@
 _httpicontbrwseof_ [l=ru] {_httpimg_/ru/tbrwseof.gif}
 _widthtbrwsex_ [l=ru] {87}
-_heighttbrwsex_ [l=ru] {17}
 
 ## "пПОск" ## nav_bar_button ## tsrch ##
@@ -204 +186 @@
 _httpicontsrchon_ [l=ru] {_httpimg_/ru/tsrchon.gif}
 _widthtsrchx_ [l=ru] {87}
-_heighttsrchx_ [l=ru] {17}
 
 ## "МазваМОя а-я" ## nav_bar_button ## ttitl ##
@@ -210 +191 @@
 _httpiconttitlof_ [l=ru] {_httpimg_/ru/ttitlof.gif}
 _httpiconttitlon_ [l=ru] {_httpimg_/ru/ttitlon.gif}
-_widthttitlx_ [l=ru] {133}
-_heightttitlx_ [l=ru] {17}
+_widthttitlx_ [l=ru] {114}
 
 ## "персПМалОО" ## nav_bar_button ## tpeop ##
@@ -217 +197 @@
 _httpicontpeopof_ [l=ru] {_httpimg_/ru/tpeopof.gif}
 _httpicontpeopon_ [l=ru] {_httpimg_/ru/tpeopon.gif}
-_widthtpeopx_ [l=ru] {121}
-_heighttpeopx_ [l=ru] {17}
+_widthtpeopx_ [l=ru] {87}
 
 ## "МазваМОя" ## nav_bar_button ## tlang ##
@@ -224 +203 @@
 _httpicontlangon_ [l=ru] {_httpimg_/ru/tlangon.gif}
 _httpicontlangof_ [l=ru] {_httpimg_/ru/tlangof.gif}
-_widthtlangx_ [l=ru] {97}
-_heighttlangx_ [l=ru] {17}
+_widthtlangx_ [l=ru] {87}
 
 ## "акрПМОЌы" ## nav_bar_button ## tacro ##
@@ -231 +209 @@
 _httpicontacroof_ [l=ru] {_httpimg_/ru/tacroof.gif}
 _httpicontacroon_ [l=ru] {_httpimg_/ru/tacroon.gif}
-_widthtacrox_ [l=ru] {106}
-_heighttacrox_ [l=ru] {17}
+_widthtacrox_ [l=ru] {87}
 
 ## "фразы" ## nav_bar_button ## tphrse ##
@@ -239 +216 @@
 _httpicontphrseon_ [l=ru] {_httpimg_/ru/tphrseon.gif}
 _widthtphrsex_ [l=ru] {87}
-_heighttphrsex_ [l=ru] {17}
 
 
@@ -426 +402 @@
 _httpiconcontoff_ [l=ru] {_httpimg_/ru/contoff.gif}
 _httpiconconton_ [l=ru] {_httpimg_/ru/conton.gif}
-_widthcontx_ [l=ru] {104}
-_heightcontx_ [l=ru] {17}
 
 ## "ВЕСЬ ТЕКСТ" ## document_button ## eallt ## 
 _httpiconealltof_ [l=ru] {_httpimg_/ru/ealltof.gif}
 _httpiconeallton_ [l=ru] {_httpimg_/ru/eallton.gif}
-_widthealltx_ [l=ru] {71}
-_heightealltx_ [l=ru] {30}
 
 ## "  СВЕРНУТЬ
@@ -439 +411 @@
 _httpiconeconcof_ [l=ru] {_httpimg_/ru/econcof.gif}
 _httpiconeconcon_ [l=ru] {_httpimg_/ru/econcon.gif}
-_widtheconcx_ [l=ru] {77}
-_heighteconcx_ [l=ru] {30}
 
 ## "НОВОЕ ОКНО" ## document_button ## edtch ##
 _httpiconedtchof_ [l=ru] {_httpimg_/ru/edtchof.gif}
 _httpiconedtchon_ [l=ru] {_httpimg_/ru/edtchon.gif}
-_widthedtchx_ [l=ru] {76}
-_heightedtchx_ [l=ru] {30}
 
 ## "  РАСКРЫТЬ
@@ -452 +420 @@
 _httpiconeexpcof_ [l=ru] {_httpimg_/ru/eexpcof.gif}
 _httpiconeexpcon_ [l=ru] {_httpimg_/ru/eexpcon.gif}
-_widtheexpcx_ [l=ru] {77}
-_heighteexpcx_ [l=ru] {30}
 
 ## "СВЕРНУТЬ
@@ -459 +425 @@
 _httpiconetsecof_ [l=ru] {_httpimg_/ru/etsecof.gif}
 _httpiconetsecon_ [l=ru] {_httpimg_/ru/etsecon.gif}
-_widthetsecx_ [l=ru] {65}
-_heightetsecx_ [l=ru] {30}
 
 ## "ВЫДЕЛИТЬ
@@ -466 +430 @@
 _httpiconehlof_ [l=ru] {_httpimg_/ru/ehlof.gif}
 _httpiconehlon_ [l=ru] {_httpimg_/ru/ehlon.gif}
-_widthehlx_ [l=ru] {65}
-_heightehlx_ [l=ru] {30}
 
 ## "     СНЯТЬ
@@ -473 +435 @@
 _httpiconenhlof_ [l=ru] {_httpimg_/ru/enhlof.gif}
 _httpiconenhlon_ [l=ru] {_httpimg_/ru/enhlon.gif}
-_widthenhlx_ [l=ru] {70}
-_heightenhlx_ [l=ru] {30}
-
 
 
@@ -535 +494 @@
 # _hselection_, _jselection_, _nselection_ and _gselection_ are set from 
 # within the server some or all of them may remain unset
-
 
 
@@ -816 +774 @@
 </table>
 
-
 }
 
 _booktexthelpreadingdocs_ [l=ru] {
-
 <p>_iconblankbar_
 <a name=reading-docs>
@@ -864 +820 @@
 <h2>_textreadingdocs_</h2>
 
-<p>НекПтПрые бОблОПграфОческОе картПчкО сПЎержат ЌМПгП разлОчМПй ОМфПрЌацОО, МапрОЌер реферат ЎПкуЌеМта. Вы увОЎОте этП Ма страМОце результатПв пПОска: еслО  бОблОПграфОческая картПчка сПЎержОт ОМПфПрЌацОю, тП ПМа буЎет пПказаМы в вОЎе зМачка _icontext_ взаЌеМ зМачка _iconblanktext_
-.
+<p>НекПтПрые бОблОПграфОческОе картПчкО сПЎержат ЌМПгП разлОчМПй ОМфПрЌацОО, МапрОЌер реферат ЎПкуЌеМта. Вы увОЎОте этП Ма страМОце результатПв пПОска: еслО  бОблОПграфОческая картПчка сПЎержОт ОМПфПрЌацОю, тП ПМа буЎет пПказаМы в вОЎе зМачка _icontext_ взаЌеМ зМачка _iconblanktext_.
 
 <p>Нажав Ма зМачПк _icontext_ вы пПлучОте бПльше ОМфПрЌацОО П ЎПкуЌеМте.

trunk/gsdl/macros/russian2.dm

@@ -35 +35 @@
 #_heightnzdl_ {181}
 
-### "выберОте кПллекцОю" ## green_bar_left_aligned ## selcolgr ##
-#_httpiconselcolgr_ {_httpimg_/selcolgr.gif}
-#_widthselcolgr_ {537}
-#_heightselcolgr_ {17}
-#_altselcolgr_ {"ВыберОте кПллекцОю"}
+## "выберОте кПллекцОю" ## green_bar_left_aligned ## selcolgr ##
+_httpiconselcolgr_ [l=ru] {_httpimg_/selcolgr.gif}
+_widthselcolgr_ [l=ru] {537}
+_heightselcolgr_ [l=ru] {17}
+_altselcolgr_ [l=ru] {"ВыберОте кПллекцОю"}
 
 

trunk/gsdl/macros/spanish.dm

@@ -125 +125 @@
 _httpiconchomeof_ [l=es] {_httpimg_/es/chomeof.gif}
 _httpiconchomeon_ [l=es] {_httpimg_/es/chomeon.gif}
-_widthchomex_ [l=es] {65}
-_heightchomex_ [l=es] {20}
 
 ## "AYUDA" ## top_nav_button ## chelp ##
 _httpiconchelpof_ [l=es] {_httpimg_/es/chelpof.gif}
 _httpiconchelpon_ [l=es] {_httpimg_/es/chelpon.gif}
-_widthchelpx_ [l=es] {46}
-_heightchelpx_ [l=es] {20}
    
 ## "PREFERENCIAS" ## top_nav_button ## cpref ##
 _httpiconcprefof_ [l=es] {_httpimg_/es/cprefof.gif}
 _httpiconcprefon_ [l=es] {_httpimg_/es/cprefon.gif}
-_widthcprefx_ [l=es] {88}
-_heightcprefx_ [l=es] {20}
 
 ## "ayuda" ## green_title ## h_help ##
@@ -150 +144 @@
 _httpicontauthon_ [l=es] {_httpimg_/es/tauthon.gif}
 _widthtauthx_ [l=es] {100}
-_heighttauthx_ [l=es] {17}
 
 ## "series" ## nav_bar_button ## tser ##
@@ -157 +150 @@
 _httpicontseron_ [l=es] {_httpimg_/es/tseron.gif}
 _widthtserx_ [l=es] {87}
-_heighttserx_ [l=es] {17}
 
 ## "fechas" ## nav_bar_button ## tdate ##
@@ -164 +156 @@
 _httpicontdateon_ [l=es] {_httpimg_/es/tdateon.gif}
 _widthtdatex_ [l=es] {87}
-_heighttdatex_ [l=es] {17}
 
 ## "temas" ## nav_bar_button ## tsubj ##
@@ -171 +162 @@
 _httpicontsubjof_ [l=es] {_httpimg_/es/tsubjof.gif}
 _widthtsubjx_ [l=es] {87}
-_heighttsubjx_ [l=es] {17}
 
 ## "organización" ## nav_bar_button ## torg ##
@@ -178 +168 @@
 _httpicontorgof_ [l=es] {_httpimg_/es/torgof.gif}
 _widthtorgx_ [l=es] {108}
-_heighttorgx_ [l=es] {17}
 
 ## "cómo" ## nav_bar_button ## thow ##
@@ -185 +174 @@
 _httpiconthowof_ [l=es] {_httpimg_/es/thowof.gif}
 _widththowx_ [l=es] {87}
-_heightthowx_ [l=es] {17}
 
 ## "tópicos" ## nav_bar_button ## ttopic ##
@@ -192 +180 @@
 _httpiconttopicof_ [l=es] {_httpimg_/es/ttopicof.gif}
 _widthttopicx_ [l=es] {87}
-_heightttopicx_ [l=es] {17}
 
 ## "navegar" ## nav_bar_button ## tbrwse ##
@@ -199 +186 @@
 _httpicontbrwseof_ [l=es] {_httpimg_/es/tbrwseof.gif}
 _widthtbrwsex_ [l=es] {87}
-_heighttbrwsex_ [l=es] {17}
 
 ## "buscar" ## nav_bar_button ## tsrch ##
@@ -206 +192 @@
 _httpicontsrchon_ [l=es] {_httpimg_/es/tsrchon.gif}
 _widthtsrchx_ [l=es] {87}
-_heighttsrchx_ [l=es] {17}
 
 ## "títulos a-z" ## nav_bar_button ## ttitl ##
@@ -213 +198 @@
 _httpiconttitlon_ [l=es] {_httpimg_/es/ttitlon.gif}
 _widthttitlx_ [l=es] {90}
-_heightttitlx_ [l=es] {17}
 
 ## "gente" ## nav_bar_button ## tpeop ##
@@ -220 +204 @@
 _httpicontpeopon_ [l=es] {_httpimg_/es/tpeopon.gif}
 _widthtpeopx_ [l=es] {87}
-_heighttpeopx_ [l=es] {17}
-
 
 
@@ -372 +354 @@
 _httpiconcontoff_ [l=es] {_httpimg_/es/contoff.gif}
 _httpiconconton_ [l=es] {_httpimg_/es/conton.gif}
-_widthcontx_ [l=es] {122}
-_heightcontx_ [l=es] {17}
 
 ## "TEXTO COMPLETO" ## document_button ## eallt ## 
 _httpiconealltof_ [l=es] {_httpimg_/es/ealltof.gif}
 _httpiconeallton_ [l=es] {_httpimg_/es/eallton.gif}
-_widthealltx_ [l=es] {91}
-_heightealltx_ [l=es] {30}
 
 ## "CONTRAER ÍNDICE" ## document_button ## econc ##
 _httpiconeconcof_ [l=es] {_httpimg_/es/econcof.gif}
 _httpiconeconcon_ [l=es] {_httpimg_/es/econcon.gif}
-_widtheconcx_ [l=es] {92}
-_heighteconcx_ [l=es] {30}
 
 ## "SEPARAR" ## document_button ## edtch ##
 _httpiconedtchof_ [l=es] {_httpimg_/es/edtchof.gif}
 _httpiconedtchon_ [l=es] {_httpimg_/es/edtchon.gif}
-_widthedtchx_ [l=es] {65}
-_heightedtchx_ [l=es] {30}
 
 ## "EXPANDIR ÍNDICE" ## document_button ## eexpc ##
 _httpiconeexpcof_ [l=es] {_httpimg_/es/eexpcof.gif}
 _httpiconeexpcon_ [l=es] {_httpimg_/es/eexpcon.gif}
-_widtheexpcx_ [l=es] {86}
-_heighteexpcx_ [l=es] {30}
 
 ## "CONTRAER TEXTO" ## document_button ## etsec ##
 _httpiconetsecof_ [l=es] {_httpimg_/es/etsecof.gif}
 _httpiconetsecon_ [l=es] {_httpimg_/es/etsecon.gif}
-_widthetsecx_ [l=es] {90}
-_heightetsecx_ [l=es] {30}
 
 ## "RESALTAR" ## document_button ## ehl ##
 _httpiconehlof_ [l=es] {_httpimg_/es/ehlof.gif}
 _httpiconehlon_ [l=es] {_httpimg_/es/ehlon.gif}
-_widthehlx_ [l=es] {65}
-_heightehlx_ [l=es] {30}
 
 ## "NO RESALTAR" ## document_button ## enhl ##
 _httpiconenhlof_ [l=es] {_httpimg_/es/enhlof.gif}
 _httpiconenhlon_ [l=es] {_httpimg_/es/enhlon.gif}
-_widthenhlx_ [l=es] {65}
-_heightenhlx_ [l=es] {30}
-