From: <ha...@us...> - 2006-09-21 16:05:03
|
Revision: 5636 http://svn.sourceforge.net/jmol/?rev=5636&view=rev Author: hansonr Date: 2006-09-21 09:04:52 -0700 (Thu, 21 Sep 2006) Log Message: ----------- popup menu cleanup Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-09-21 14:00:45 UTC (rev 5635) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-09-21 16:04:52 UTC (rev 5636) @@ -56,7 +56,7 @@ "aboutMenu" }, { "selectMenu", "selectAll selectNone - " + - "proteinMenu nucleicMenu heteroMenu otherMenu - " + + "proteinMenu nucleicMenu heteroMenu Carbohydrate NoneOfTheAbove - " + "elementsComputedMenu byModelMenu byFrameMenu - " + "invertSelection restrictToSelection" }, { "selectAll", "select all" }, @@ -94,20 +94,20 @@ { "U", "select u" }, { "heteroMenu", "allHetero Solvent Water - " + - "exceptSolvent exceptWater - " + - "Ligand" }, + "Ligand exceptWater nonWaterSolvent" }, { "allHetero", "select hetero" }, { "Solvent", "select solvent" }, { "Water", "select water" }, - { "exceptSolvent", "select hetero and not solvent" }, +// same as ligand { "exceptSolvent", "select hetero and not solvent" }, + { "nonWaterSolvent", "select solvent and not water" }, { "exceptWater", "select hetero and not water" }, { "Ligand", "select ligand" }, - { "otherMenu", "Carbohydrate Lipid Other" }, { "Carbohydrate", "select carbohydrate" }, - { "Lipid", "select lipid" }, - { "Other", "select not(hetero,protein,nucleic,carbohydrate,lipid)" }, +// not implemented { "Lipid", "select lipid" }, + { "NoneOfTheAbove", "select not(hetero,protein,nucleic,carbohydrate)" }, + { "byModelMenu", "allModels" }, { "allModels", "select all" }, @@ -716,18 +716,15 @@ { "T", "T" }, { "U", "U" }, - { "heteroMenu", GT._("hetero") }, - { "allHetero", GT._("All") }, - { "Solvent", GT._("Solvent") }, - { "Water", GT._("Water") }, - { "exceptSolvent", GT._("Except Solvent") }, - { "exceptWater", GT._("Except Water") }, - { "Ligand", GT._("Ligand") }, - - { "otherMenu", GT._("Other") }, + { "heteroMenu", GT._("Hetero") }, + { "allHetero", GT._("All PDB \"HETATOM\"") }, + { "Solvent", GT._("All Solvent") }, + { "Water", GT._("All Water") }, + { "nonWaterSolvent", GT._("Nonaqueous Solvent{0}", new Object[]{ " (solvent and not water)" }) }, + { "exceptWater", GT._("Nonaqueous HETATM{0}", new Object[]{ " (hetero and not water)" }) }, + { "Ligand", GT._("Ligand{0}", new Object[]{ " (hetero and not solvent)" }) }, { "Carbohydrate", GT._("Carbohydrate") }, - { "Lipid", GT._("Lipid") }, - { "Other", GT._("Other") }, + { "NoneOfTheAbove", GT._("None of the above") }, { "byModelMenu", GT._("Model") }, { "allModels", GT._("All Models") }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-09-21 18:26:12
|
Revision: 5639 http://svn.sourceforge.net/jmol/?rev=5639&view=rev Author: nicove Date: 2006-09-21 11:26:06 -0700 (Thu, 21 Sep 2006) Log Message: ----------- i18n Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-09-21 18:14:52 UTC (rev 5638) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-09-21 18:26:06 UTC (rev 5639) @@ -720,9 +720,9 @@ { "allHetero", GT._("All PDB \"HETATOM\"") }, { "Solvent", GT._("All Solvent") }, { "Water", GT._("All Water") }, - { "nonWaterSolvent", GT._("Nonaqueous Solvent{0}", new Object[]{ " (solvent and not water)" }) }, - { "exceptWater", GT._("Nonaqueous HETATM{0}", new Object[]{ " (hetero and not water)" }) }, - { "Ligand", GT._("Ligand{0}", new Object[]{ " (hetero and not solvent)" }) }, + { "nonWaterSolvent", GT._("Nonaqueous Solvent") + " (solvent and not water)" }, + { "exceptWater", GT._("Nonaqueous HETATM") + " (hetero and not water)" }, + { "Ligand", GT._("Ligand") + " (hetero and not solvent)" }, { "Carbohydrate", GT._("Carbohydrate") }, { "NoneOfTheAbove", GT._("None of the above") }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-10-07 23:17:49
|
Revision: 5862 http://svn.sourceforge.net/jmol/?rev=5862&view=rev Author: hansonr Date: 2006-10-07 16:17:44 -0700 (Sat, 07 Oct 2006) Log Message: ----------- popup menu Surface... Off Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-10-07 23:11:15 UTC (rev 5861) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-10-07 23:17:44 UTC (rev 5862) @@ -593,7 +593,7 @@ { "showUnitcell", "console on;show unitcell"}, { "extractMOL", "console on;getproperty extractModel \"visible\" "}, - { "surfaceMenu" , "surfVDW surfMolecular surfSolvent surfSolventAccessible surfMEP surfMoComputedMenu - surfOpaque surfTranslucent" }, + { "surfaceMenu" , "surfVDW surfMolecular surfSolvent surfSolventAccessible surfMEP surfMoComputedMenu - surfOpaque surfTranslucent surfOff" }, { "surfVDW", "isosurface delete resolution 0 solvent 0 translucent" }, { "surfMolecular", "isosurface delete resolution 0 molecular translucent" }, { "surfSolvent", "isosurface delete resolution 0 solvent translucent" }, @@ -601,6 +601,7 @@ { "surfMEP", "isosurface delete resolution 0 molecular map MEP translucent" }, { "surfOpaque", "isosurface opaque" }, { "surfTranslucent", "isosurface translucent" }, + { "surfOff", "isosurface delete" }, { "crystalMenu", "axesMenu bbcageMenu uccageMenu" }, @@ -1164,6 +1165,7 @@ { "surfMoComputedMenu" , GT._("Molecular Orbitals")}, { "surfOpaque", GT._("Make Opaque") }, { "surfTranslucent", GT._("Make Translucent") }, + { "surfOff", GT._("Off") }, { "crystalMenu", GT._("Crystal") }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-10-07 23:20:53
|
Revision: 5863 http://svn.sourceforge.net/jmol/?rev=5863&view=rev Author: hansonr Date: 2006-10-07 16:20:49 -0700 (Sat, 07 Oct 2006) Log Message: ----------- Surfaces ... Dot Surface Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-10-07 23:17:44 UTC (rev 5862) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-10-07 23:20:49 UTC (rev 5863) @@ -593,7 +593,8 @@ { "showUnitcell", "console on;show unitcell"}, { "extractMOL", "console on;getproperty extractModel \"visible\" "}, - { "surfaceMenu" , "surfVDW surfMolecular surfSolvent surfSolventAccessible surfMEP surfMoComputedMenu - surfOpaque surfTranslucent surfOff" }, + { "surfaceMenu" , "surfDots surfVDW surfMolecular surfSolvent surfSolventAccessible surfMEP surfMoComputedMenu - surfOpaque surfTranslucent surfOff" }, + { "surfDots", "select *;dots on" }, { "surfVDW", "isosurface delete resolution 0 solvent 0 translucent" }, { "surfMolecular", "isosurface delete resolution 0 molecular translucent" }, { "surfSolvent", "isosurface delete resolution 0 solvent translucent" }, @@ -601,7 +602,7 @@ { "surfMEP", "isosurface delete resolution 0 molecular map MEP translucent" }, { "surfOpaque", "isosurface opaque" }, { "surfTranslucent", "isosurface translucent" }, - { "surfOff", "isosurface delete" }, + { "surfOff", "isosurface delete;select *;dots off" }, { "crystalMenu", "axesMenu bbcageMenu uccageMenu" }, @@ -1157,6 +1158,7 @@ { "extractMOL", GT._("Extract MOL data")}, { "surfaceMenu", GT._("Surfaces")}, + { "surfDots", GT._("Dot Surface") }, { "surfVDW", GT._("van der Waals Surface") }, { "surfMolecular", GT._("Molecular Surface") }, { "surfSolvent", GT._("Solvent Surface - 1.2 Angstrom") }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-10-07 23:36:54
|
Revision: 5864 http://svn.sourceforge.net/jmol/?rev=5864&view=rev Author: hansonr Date: 2006-10-07 16:36:50 -0700 (Sat, 07 Oct 2006) Log Message: ----------- enough already! Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-10-07 23:20:49 UTC (rev 5863) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2006-10-07 23:36:50 UTC (rev 5864) @@ -227,7 +227,7 @@ { "colorMenu", "colorAtomMenu colorBondMenu colorHbondMenu colorSSbondMenu - " + "colorBackboneMenu colorTraceMenu colorCartoonMenu colorRibbonsMenu - " + - "colorLabelMenu colorBackgroundMenu - " + + "colorLabelMenu colorSurfaceMenu colorBackgroundMenu - " + "colorVectorMenu" }, { "colorAtomMenu", "colorAtomSchemeMenu - " + "colorAtomBlack colorAtomWhite - " + @@ -466,6 +466,21 @@ { "colorBackgroundViolet", "background violet" }, { "colorBackgroundCyan", "background cyan" }, + { "colorSurfaceMenu", "colorSurfaceBlack colorSurfaceWhite - " + + "colorSurfaceRed colorSurfaceOrange colorSurfaceYellow " + + "colorSurfaceGreen colorSurfaceBlue colorSurfaceIndigo " + + "colorSurfaceViolet - surfOpaque surfTranslucent" }, + { "colorSurfaceBlack", "color isosurface black" }, + { "colorSurfaceWhite", "color isosurface white" }, + { "colorSurfaceRed", "color isosurface red" }, + { "colorSurfaceOrange", "color isosurface orange" }, + { "colorSurfaceYellow", "color isosurface yellow" }, + { "colorSurfaceGreen", "color isosurface green" }, + { "colorSurfaceBlue", "color isosurface blue" }, + { "colorSurfaceIndigo", "color isosurface indigo" }, + { "colorSurfaceViolet", "color isosurface violet" }, + { "colorSurfaceCyan", "color isosurface cyan" }, + { "colorVectorMenu", "colorVectorInherit - " + "colorVectorBlack colorVectorWhite colorVectorCyan - " + "colorVectorRed colorVectorOrange colorVectorYellow colorVectorGreen " + @@ -1040,6 +1055,18 @@ { "colorBackgroundViolet", GT._("Violet") }, { "colorBackgroundCyan", GT._("Cyan") }, + { "colorSurfaceMenu", GT._("Surface") }, + { "colorSurfaceBlack", GT._("Black") }, + { "colorSurfaceWhite", GT._("White") }, + { "colorSurfaceRed", GT._("Red") }, + { "colorSurfaceOrange", GT._("Orange") }, + { "colorSurfaceYellow", GT._("Yellow") }, + { "colorSurfaceGreen", GT._("Green") }, + { "colorSurfaceBlue", GT._("Blue") }, + { "colorSurfaceIndigo", GT._("Indigo") }, + { "colorSurfaceViolet", GT._("Violet") }, + { "colorSurfaceCyan", GT._("Cyan") }, + { "colorVectorMenu", GT._("Vectors") }, { "colorVectorInherit", GT._("Inherit") }, { "colorVectorBlack", GT._("Black") }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ahe...@us...> - 2007-01-09 20:27:17
|
Revision: 6611 http://svn.sourceforge.net/jmol/?rev=6611&view=rev Author: aherraez Date: 2007-01-09 12:27:11 -0800 (Tue, 09 Jan 2007) Log Message: ----------- reverse cross-eyed and wall-eyed in Stereo pop-up Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-01-09 18:56:41 UTC (rev 6610) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-01-09 20:27:11 UTC (rev 6611) @@ -250,8 +250,8 @@ { "stereoRedCyan", "stereo redcyan 3" }, { "stereoRedBlue", "stereo redblue 3" }, { "stereoRedGreen", "stereo redgreen 3" }, - { "stereoCrossEyed", "stereo 5" }, - { "stereoWallEyed", "stereo -5" }, + { "stereoCrossEyed", "stereo -5" }, + { "stereoWallEyed", "stereo 5" }, { "labelMenu", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-01-16 20:52:00
|
Revision: 6655 http://svn.sourceforge.net/jmol/?rev=6655&view=rev Author: hansonr Date: 2007-01-16 12:44:40 -0800 (Tue, 16 Jan 2007) Log Message: ----------- 11.1 stereo fix Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-01-16 20:43:45 UTC (rev 6654) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-01-16 20:44:40 UTC (rev 6655) @@ -250,8 +250,8 @@ { "stereoRedCyan", "stereo redcyan 3" }, { "stereoRedBlue", "stereo redblue 3" }, { "stereoRedGreen", "stereo redgreen 3" }, - { "stereoCrossEyed", "stereo -5" }, - { "stereoWallEyed", "stereo 5" }, + { "stereoCrossEyed", "stereo 5" }, + { "stereoWallEyed", "stereo -5" }, { "labelMenu", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-03-29 17:58:22
|
Revision: 7255 http://svn.sourceforge.net/jmol/?rev=7255&view=rev Author: hansonr Date: 2007-03-29 10:58:20 -0700 (Thu, 29 Mar 2007) Log Message: ----------- 11.1.28 popup menu bug: "basic (+)" not working Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-03-29 17:40:48 UTC (rev 7254) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-03-29 17:58:20 UTC (rev 7255) @@ -92,7 +92,7 @@ { "proteinSideChains", "protein and not backbone" }, { "polar", "protein and polar" }, { "nonpolar", "protein and not polar" }, - { "positive ", "protein and basic" }, + { "positiveCharge", "protein and basic" }, { "negativeCharge", "protein and acidic" }, { "noCharge", "protein and not (acidic,basic)" }, { "allCarbo", "carbohydrate" }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-05 04:16:20
|
Revision: 7575 http://svn.sourceforge.net/jmol/?rev=7575&view=rev Author: hansonr Date: 2007-05-04 21:16:17 -0700 (Fri, 04 May 2007) Log Message: ----------- 11.1.32 fixing GT._ calls so that xgettext can find string literals again. Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-04 23:30:42 UTC (rev 7574) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-05 04:16:17 UTC (rev 7575) @@ -25,9 +25,6 @@ import java.util.Properties; -import org.jmol.util.Logger; -import org.jmol.i18n.GT; - class PopupResourceBundle { @@ -65,6 +62,13 @@ static String Box(String cmd) { return "if not(showBoundBox);if not(showUnitcell);boundbox on;"+cmd+";boundbox off;else;"+cmd+";endif;endif;"; } + + /* + * OK, a slight of hand here: + * + * GT._() a method in the popup package that does nothing. + * + */ private static final String[][] structureContents = { { "popupMenu", @@ -471,386 +475,382 @@ { "translatingUrl", "http://wiki.jmol.org/index.php/Internationalisation" }, }; private static final String[][] wordContents = { - { "modelSetMenu", "No atoms loaded", null }, - { "CONFIGURATIONComputedMenu", "Configurations", null }, - { "hiddenModelSetName", "Model information", null }, + { "modelSetMenu", GT._("No atoms loaded") }, + { "CONFIGURATIONComputedMenu", GT._("Configurations") }, + { "hiddenModelSetName", GT._("Model information") }, - { "selectMenu", "Select", null }, - { "elementsComputedMenu", "Element", null }, - { "selectAll", "All", null }, - { "selectNone", "None", null }, - { "hideNotSelected;hide(none)Checkbox", "Display Selected Only", null }, - { "invertSelection", "Invert Selection", null }, + { "selectMenu", GT._("Select") }, + { "elementsComputedMenu", GT._("Element") }, + { "selectAll", GT._("All") }, + { "selectNone", GT._("None") }, + { "hideNotSelected;hide(none)Checkbox", GT._("Display Selected Only") }, + { "invertSelection", GT._("Invert Selection") }, - { "viewMenu", "View", null }, - { "front", "Front", null }, - { "left", "Left", null }, - { "right", "Right", null }, - { "top", "Top", null }, - { "bottom", "Bottom", null }, - { "back", "Back", null }, + { "viewMenu", GT._("View") }, + { "front", GT._("Front") }, + { "left", GT._("Left") }, + { "right", GT._("Right") }, + { "top", GT._("Top") }, + { "bottom", GT._("Bottom") }, + { "back", GT._("Back") }, - { "PDBproteinMenu", "Protein", null }, - { "allProtein", "All", null }, - { "proteinBackbone", "Backbone", null }, - { "proteinSideChains", "Side Chains", null }, - { "polar", "Polar Residues", null }, - { "nonpolar", "Nonpolar Residues", null }, - { "positiveCharge", "Basic Residues (+)", null }, - { "negativeCharge", "Acidic Residues (-)", null }, - { "noCharge", "Uncharged Residues", null }, - { "PDBaaResiduesComputedMenu", "By Residue Name", null }, - { "PDBnucleicResiduesComputedMenu", "By Residue Name", null }, - { "PDBcarboResiduesComputedMenu", "By Residue Name", null }, - { "PDBheteroComputedMenu", "By HETATM", null }, - { "PDBnucleicMenu", "Nucleic", null }, - { "allNucleic", "All", null }, - { "DNA", "DNA", null }, - { "RNA", "RNA", null }, - { "nucleicBackbone", "Backbone", null }, - { "nucleicBases", "Bases", null }, - { "atPairs", "AT pairs", null }, - { "gcPairs", "GC pairs", null }, - { "auPairs", "AU pairs", null }, - { "A", "A" }, - { "C", "C" }, - { "G", "G" }, - { "T", "T" }, - { "U", "U" }, + { "PDBproteinMenu", GT._("Protein") }, + { "allProtein", GT._("All") }, + { "proteinBackbone", GT._("Backbone") }, + { "proteinSideChains", GT._("Side Chains") }, + { "polar", GT._("Polar Residues") }, + { "nonpolar", GT._("Nonpolar Residues") }, + { "positiveCharge", GT._("Basic Residues (+)") }, + { "negativeCharge", GT._("Acidic Residues (-)") }, + { "noCharge", GT._("Uncharged Residues") }, + { "PDBaaResiduesComputedMenu", GT._("By Residue Name") }, + { "PDBnucleicResiduesComputedMenu", GT._("By Residue Name") }, + { "PDBcarboResiduesComputedMenu", GT._("By Residue Name") }, + { "PDBheteroComputedMenu", GT._("By HETATM") }, + { "PDBnucleicMenu", GT._("Nucleic") }, + { "allNucleic", GT._("All") }, + { "DNA", GT._("DNA") }, + { "RNA", GT._("RNA") }, + { "nucleicBackbone", GT._("Backbone") }, + { "nucleicBases", GT._("Bases") }, + { "atPairs", GT._("AT pairs") }, + { "gcPairs", GT._("GC pairs") }, + { "auPairs", GT._("AU pairs") }, + { "A", "A" }, + { "C", "C" }, + { "G", "G" }, + { "T", "T" }, + { "U", "U" }, - { "PDBheteroMenu", "Hetero", null }, - { "allHetero", "All PDB \"HETATM\"", null }, - { "Solvent", "All Solvent", null }, - { "Water", "All Water", null }, - { "nonWaterSolvent", "Nonaqueous Solvent", null, " (solvent and not water)" }, - { "exceptWater", "Nonaqueous HETATM", null, " (hetero and not water)" }, - { "Ligand", "Ligand", null, " (hetero and not solvent)" }, + { "PDBheteroMenu", GT._("Hetero") }, + { "allHetero", GT._("All PDB \"HETATM\"") }, + { "Solvent", GT._("All Solvent") }, + { "Water", GT._("All Water") }, + { "nonWaterSolvent", + GT._("Nonaqueous Solvent", "(solvent and not water)") }, + { "exceptWater", GT._("Nonaqueous HETATM", "(hetero and not water)") }, + { "Ligand", GT._("Ligand", "(hetero and not solvent)") }, - { "allCarbo", "All", null }, - { "PDBcarboMenu", "Carbohydrate", null }, - { "PDBnoneOfTheAbove", "None of the above", null }, + { "allCarbo", GT._("All") }, + { "PDBcarboMenu", GT._("Carbohydrate") }, + { "PDBnoneOfTheAbove", GT._("None of the above") }, - { "FRAMESbyModelComputedMenu", "Model/Frame", null }, + { "FRAMESbyModelComputedMenu", GT._("Model/Frame") }, - { "renderMenu", "Style", null }, - { "renderSchemeMenu", "Scheme", null }, - { "renderCpkSpacefill", "CPK Spacefill", null }, - { "renderBallAndStick", "Ball and Stick", null }, - { "renderSticks", "Sticks", null }, - { "renderWireframe", "Wireframe", null }, - { "renderPDBCartoonsOnly", "Cartoon", null }, - { "renderPDBTraceOnly", "Trace", null }, + { "renderMenu", GT._("Style") }, + { "renderSchemeMenu", GT._("Scheme") }, + { "renderCpkSpacefill", GT._("CPK Spacefill") }, + { "renderBallAndStick", GT._("Ball and Stick") }, + { "renderSticks", GT._("Sticks") }, + { "renderWireframe", GT._("Wireframe") }, + { "renderPDBCartoonsOnly", GT._("Cartoon") }, + { "renderPDBTraceOnly", GT._("Trace") }, - { "atomMenu", "Atoms", null }, - { "atomNone", "Off", null }, - { "atom15", "{0}% van der Waals", "15" }, - { "atom20", "{0}% van der Waals", "20" }, - { "atom25", "{0}% van der Waals", "25" }, - { "atom50", "{0}% van der Waals", "50" }, - { "atom75", "{0}% van der Waals", "75" }, - { "atom100", "{0}% van der Waals", "100" }, + { "atomMenu", GT._("Atoms") }, + { "atomNone", GT._("Off") }, + { "atom15", GT._("{0}% van der Waals", "15") }, + { "atom20", GT._("{0}% van der Waals", "20") }, + { "atom25", GT._("{0}% van der Waals", "25") }, + { "atom50", GT._("{0}% van der Waals", "50") }, + { "atom75", GT._("{0}% van der Waals", "75") }, + { "atom100", GT._("{0}% van der Waals", "100") }, - { "bondMenu", "Bonds", null }, - { "bondNone", "Off", null }, - { "bondWireframe", "On", null }, - { "bond100", "{0} \u00C5", "0.10" }, - { "bond150", "{0} \u00C5", "0.15" }, - { "bond200", "{0} \u00C5", "0.20" }, - { "bond250", "{0} \u00C5", "0.25" }, - { "bond300", "{0} \u00C5", "0.30" }, + { "bondMenu", GT._("Bonds") }, + { "bondNone", GT._("Off") }, + { "bondWireframe", GT._("On") }, + { "bond100", GT._("{0} \u00C5", "0.10") }, + { "bond150", GT._("{0} \u00C5", "0.15") }, + { "bond200", GT._("{0} \u00C5", "0.20") }, + { "bond250", GT._("{0} \u00C5", "0.25") }, + { "bond300", GT._("{0} \u00C5", "0.30") }, - { "hbondMenu", "Hydrogen Bonds", null }, - { "hbondNone", "Off", null }, - { "PDBhbondCalc", "Calculate", null }, - { "hbondWireframe", "On", null }, - { "PDBhbondSidechain", "Set H-Bonds Side Chain", null }, - { "PDBhbondBackbone", "Set H-Bonds Backbone", null }, - { "hbond100", "{0} \u00C5", "0.10" }, - { "hbond150", "{0} \u00C5", "0.15" }, - { "hbond200", "{0} \u00C5", "0.20" }, - { "hbond250", "{0} \u00C5", "0.25" }, - { "hbond300", "{0} \u00C5", "0.30" }, + { "hbondMenu", GT._("Hydrogen Bonds") }, + { "hbondNone", GT._("Off") }, + { "PDBhbondCalc", GT._("Calculate") }, + { "hbondWireframe", GT._("On") }, + { "PDBhbondSidechain", GT._("Set H-Bonds Side Chain") }, + { "PDBhbondBackbone", GT._("Set H-Bonds Backbone") }, + { "hbond100", GT._("{0} \u00C5", "0.10") }, + { "hbond150", GT._("{0} \u00C5", "0.15") }, + { "hbond200", GT._("{0} \u00C5", "0.20") }, + { "hbond250", GT._("{0} \u00C5", "0.25") }, + { "hbond300", GT._("{0} \u00C5", "0.30") }, - { "ssbondMenu", "Disulfide Bonds", null }, - { "ssbondNone", "Off", null }, - { "ssbondWireframe", "On", null }, - { "PDBssbondSidechain", "Set SS-Bonds Side Chain", null }, - { "PDBssbondBackbone", "Set SS-Bonds Backbone", null }, - { "ssbond100", "{0} \u00C5", "0.10" }, - { "ssbond150", "{0} \u00C5", "0.15" }, - { "ssbond200", "{0} \u00C5", "0.20" }, - { "ssbond250", "{0} \u00C5", "0.25" }, - { "ssbond300", "{0} \u00C5", "0.30" }, + { "ssbondMenu", GT._("Disulfide Bonds") }, + { "ssbondNone", GT._("Off") }, + { "ssbondWireframe", GT._("On") }, + { "PDBssbondSidechain", GT._("Set SS-Bonds Side Chain") }, + { "PDBssbondBackbone", GT._("Set SS-Bonds Backbone") }, + { "ssbond100", GT._("{0} \u00C5", "0.10") }, + { "ssbond150", GT._("{0} \u00C5", "0.15") }, + { "ssbond200", GT._("{0} \u00C5", "0.20") }, + { "ssbond250", GT._("{0} \u00C5", "0.25") }, + { "ssbond300", GT._("{0} \u00C5", "0.30") }, - { "PDBstructureMenu", "Structures", null }, - { "structureNone", "Off", null }, - { "backbone", "Backbone", null }, - { "cartoon", "Cartoon", null }, - { "cartoonRockets", "Cartoon Rockets", null }, - { "ribbons", "Ribbons", null }, - { "rockets", "Rockets", null }, - { "strands", "Strands", null }, - { "trace", "Trace", null }, + { "PDBstructureMenu", GT._("Structures") }, + { "structureNone", GT._("Off") }, + { "backbone", GT._("Backbone") }, + { "cartoon", GT._("Cartoon") }, + { "cartoonRockets", GT._("Cartoon Rockets") }, + { "ribbons", GT._("Ribbons") }, + { "rockets", GT._("Rockets") }, + { "strands", GT._("Strands") }, + { "trace", GT._("Trace") }, - { "VIBRATIONMenu", "Vibration", null }, - { "vibrationOff", "Off", null }, - { "vibrationOn", "On", null }, - { "VIBRATIONvectorMenu", "Vectors", null }, - { "vectorOff", "Off", null }, - { "vectorOn", "On", null }, - { "vector3", "{0} pixels", "3" }, - { "vector005", "{0} \u00C5", "0.05" }, - { "vector01", "{0} \u00C5", "0.10" }, - { "vectorScale02", "Scale {0}", "0.2" }, - { "vectorScale05", "Scale {0}", "0.5" }, - { "vectorScale1", "Scale {0}", "1" }, - { "vectorScale2", "Scale {0}", "2" }, - { "vectorScale5", "Scale {0}", "5" }, + { "VIBRATIONMenu", GT._("Vibration") }, + { "vibrationOff", GT._("Off") }, + { "vibrationOn", GT._("On") }, + { "VIBRATIONvectorMenu", GT._("Vectors") }, + { "vectorOff", GT._("Off") }, + { "vectorOn", GT._("On") }, + { "vector3", GT._("{0} pixels", "3") }, + { "vector005", GT._("{0} \u00C5", "0.05") }, + { "vector01", GT._("{0} \u00C5", "0.10") }, + { "vectorScale02", GT._("Scale {0}", "0.2") }, + { "vectorScale05", GT._("Scale {0}", "0.5") }, + { "vectorScale1", GT._("Scale {0}", "1") }, + { "vectorScale2", GT._("Scale {0}", "2") }, + { "vectorScale5", GT._("Scale {0}", "5") }, - { "stereoMenu", "Stereographic", null }, - { "stereoNone", "None", null }, - { "stereoRedCyan", "Red+Cyan glasses", null }, - { "stereoRedBlue", "Red+Blue glasses", null }, - { "stereoRedGreen", "Red+Green glasses", null }, - { "stereoCrossEyed", "Cross-eyed viewing", null }, - { "stereoWallEyed", "Wall-eyed viewing", null }, + { "stereoMenu", GT._("Stereographic") }, + { "stereoNone", GT._("None") }, + { "stereoRedCyan", GT._("Red+Cyan glasses") }, + { "stereoRedBlue", GT._("Red+Blue glasses") }, + { "stereoRedGreen", GT._("Red+Green glasses") }, + { "stereoCrossEyed", GT._("Cross-eyed viewing") }, + { "stereoWallEyed", GT._("Wall-eyed viewing") }, - { "labelMenu", "Labels", null }, + { "labelMenu", GT._("Labels") }, - { "labelNone", "None", null }, - { "labelSymbol", "With Element Symbol", null }, - { "labelName", "With Atom Name", null }, - { "labelNumber", "With Atom Number", null }, + { "labelNone", GT._("None") }, + { "labelSymbol", GT._("With Element Symbol") }, + { "labelName", GT._("With Atom Name") }, + { "labelNumber", GT._("With Atom Number") }, - { "labelPositionMenu", "Position Label on Atom", null }, - { "labelCentered", "Centered", null }, - { "labelUpperRight", "Upper Right", null }, - { "labelLowerRight", "Lower Right", null }, - { "labelUpperLeft", "Upper Left", null }, - { "labelLowerLeft", "Lower Left", null }, + { "labelPositionMenu", GT._("Position Label on Atom") }, + { "labelCentered", GT._("Centered") }, + { "labelUpperRight", GT._("Upper Right") }, + { "labelLowerRight", GT._("Lower Right") }, + { "labelUpperLeft", GT._("Upper Left") }, + { "labelLowerLeft", GT._("Lower Left") }, - { "colorMenu", "Color", null }, - { "colorAtomsMenu", "Atoms", null }, + { "colorMenu", GT._("Color") }, + { "colorAtomsMenu", GT._("Atoms") }, - { "SchemeMenu", "By Scheme", null }, - { "cpk", "Element (CPK)", null }, - { "altloc", "Alternative Location", null }, - { "molecule", "Molecule", null }, - { "formalcharge", "Formal Charge", null }, - { "partialCHARGE", "Partial Charge", null }, + { "SchemeMenu", GT._("By Scheme") }, + { "cpk", GT._("Element (CPK)") }, + { "altloc", GT._("Alternative Location") }, + { "molecule", GT._("Molecule") }, + { "formalcharge", GT._("Formal Charge") }, + { "partialCHARGE", GT._("Partial Charge") }, - { "amino#PDB", "Amino Acid", null }, - { "structure#PDB", "Secondary Structure", null }, - { "chain#PDB", "Chain", null }, + { "amino#PDB", GT._("Amino Acid") }, + { "structure#PDB", GT._("Secondary Structure") }, + { "chain#PDB", GT._("Chain") }, - { "none", "Inherit", null }, - { "black", "Black", null }, - { "white", "White", null }, - { "cyan", "Cyan", null }, + { "none", GT._("Inherit") }, + { "black", GT._("Black") }, + { "white", GT._("White") }, + { "cyan", GT._("Cyan") }, - { "red", "Red", null }, - { "orange", "Orange", null }, - { "yellow", "Yellow", null }, - { "green", "Green", null }, - { "blue", "Blue", null }, - { "indigo", "Indigo", null }, - { "violet", "Violet", null }, + { "red", GT._("Red") }, + { "orange", GT._("Orange") }, + { "yellow", GT._("Yellow") }, + { "green", GT._("Green") }, + { "blue", GT._("Blue") }, + { "indigo", GT._("Indigo") }, + { "violet", GT._("Violet") }, - { "salmon", "Salmon", null }, - { "olive", "Olive", null }, - { "maroon", "Maroon", null }, - { "gray", "Gray", null }, - { "slateblue", "Slate Blue", null }, - { "gold", "Gold", null }, - { "orchid", "Orchid", null }, + { "salmon", GT._("Salmon") }, + { "olive", GT._("Olive") }, + { "maroon", GT._("Maroon") }, + { "gray", GT._("Gray") }, + { "slateblue", GT._("Slate Blue") }, + { "gold", GT._("Gold") }, + { "orchid", GT._("Orchid") }, - { "opaque", "Make Opaque", null }, - { "translucent", "Make Translucent", null }, + { "opaque", GT._("Make Opaque") }, + { "translucent", GT._("Make Translucent") }, - { "colorBondsMenu", "Bonds", null }, - { "colorHbondsMenu", "Hydrogen Bonds", null }, - { "colorSSbondsMenu", "Disulfide Bonds", null }, - { "colorPDBstructuresMenu", "Structure", null }, - { "colorBackboneMenu", "Backbone", null }, - { "colorTraceMenu", "Trace", null }, - { "colorCartoonsMenu", "Cartoon", null }, - { "colorRibbonsMenu", "Ribbons", null }, - { "colorRocketsMenu", "Rockets", null }, - { "colorStrandsMenu", "Strands", null }, - { "colorLabelsMenu", "Labels", null }, - { "colorBackgroundMenu", "Background", null }, - { "colorIsoSurfaceMenu", "Surface", null }, - { "colorVectorsMenu", "Vectors", null }, - { "colorAxesMenu", "Axes", null }, - { "colorBoundBoxMenu", "Boundbox", null }, - { "colorUnitCellMenu", "Unitcell", null }, + { "colorBondsMenu", GT._("Bonds") }, + { "colorHbondsMenu", GT._("Hydrogen Bonds") }, + { "colorSSbondsMenu", GT._("Disulfide Bonds") }, + { "colorPDBstructuresMenu", GT._("Structure") }, + { "colorBackboneMenu", GT._("Backbone") }, + { "colorTraceMenu", GT._("Trace") }, + { "colorCartoonsMenu", GT._("Cartoon") }, + { "colorRibbonsMenu", GT._("Ribbons") }, + { "colorRocketsMenu", GT._("Rockets") }, + { "colorStrandsMenu", GT._("Strands") }, + { "colorLabelsMenu", GT._("Labels") }, + { "colorBackgroundMenu", GT._("Background") }, + { "colorIsoSurfaceMenu", GT._("Surface") }, + { "colorVectorsMenu", GT._("Vectors") }, + { "colorAxesMenu", GT._("Axes") }, + { "colorBoundBoxMenu", GT._("Boundbox") }, + { "colorUnitCellMenu", GT._("Unitcell") }, - { "zoomMenu", "Zoom", null }, - { "zoom50", "50%" }, - { "zoom100", "100%" }, - { "zoom150", "150%" }, - { "zoom200", "200%" }, - { "zoom400", "400%" }, - { "zoom800", "800%" }, - { "zoomIn", "Zoom In", null }, - { "zoomOut", "Zoom Out", null }, + { "zoomMenu", GT._("Zoom") }, + { "zoom50", "50%" }, + { "zoom100", "100%" }, + { "zoom150", "150%" }, + { "zoom200", "200%" }, + { "zoom400", "400%" }, + { "zoom800", "800%" }, + { "zoomIn", GT._("Zoom In") }, + { "zoomOut", GT._("Zoom Out") }, - { "spinMenu", "Spin", null }, - { "spinOn", "On", null }, - { "spinOff", "Off", null }, + { "spinMenu", GT._("Spin") }, + { "spinOn", GT._("On") }, + { "spinOff", GT._("Off") }, - { "setSpinXMenu", "Set X Rate", null }, - { "setSpinYMenu", "Set Y Rate", null }, - { "setSpinZMenu", "Set Z Rate", null }, - { "setSpinFpsMenu", "Set FPS", null }, + { "setSpinXMenu", GT._("Set X Rate") }, + { "setSpinYMenu", GT._("Set Y Rate") }, + { "setSpinZMenu", GT._("Set Z Rate") }, + { "setSpinFpsMenu", GT._("Set FPS") }, - { "s0", "0" }, - { "s5", "5" }, - { "s10", "10" }, - { "s20", "20" }, - { "s30", "30" }, - { "s40", "40" }, - { "s50", "50" }, + { "s0", "0" }, + { "s5", "5" }, + { "s10", "10" }, + { "s20", "20" }, + { "s30", "30" }, + { "s40", "40" }, + { "s50", "50" }, - { "FRAMESanimateMenu", "Animation", null }, - { "animModeMenu", "Animation Mode", null }, - { "onceThrough", "Play Once", null }, - { "palindrome", "Palindrome", null }, - { "loop", "Loop", null }, - - { "play", "Play", null }, - { "pause", "Pause", null }, - { "resume", "Resume", null }, - { "stop", "Stop", null }, - { "nextframe", "Next Frame", null }, - { "prevframe", "Previous Frame", null }, - { "rewind", "Rewind", null }, - { "playrev", "Reverse", null }, - { "restart", "Restart", null }, + { "FRAMESanimateMenu", GT._("Animation") }, + { "animModeMenu", GT._("Animation Mode") }, + { "onceThrough", GT._("Play Once") }, + { "palindrome", GT._("Palindrome") }, + { "loop", GT._("Loop") }, + + { "play", GT._("Play") }, + { "pause", GT._("Pause") }, + { "resume", GT._("Resume") }, + { "stop", GT._("Stop") }, + { "nextframe", GT._("Next Frame") }, + { "prevframe", GT._("Previous Frame") }, + { "rewind", GT._("Rewind") }, + { "playrev", GT._("Reverse") }, + { "restart", GT._("Restart") }, - { "FRAMESanimFpsMenu", "Set FPS", null }, - { "animfps5", "5" }, - { "animfps10", "10" }, - { "animfps20", "20" }, - { "animfps30", "30" }, - { "animfps50", "50" }, + { "FRAMESanimFpsMenu", GT._("Set FPS") }, + { "animfps5", "5" }, + { "animfps10", "10" }, + { "animfps20", "20" }, + { "animfps30", "30" }, + { "animfps50", "50" }, - { "measureMenu", "Measurement", null }, - { "measureOff", "Double-Click begins and ends all measurements", null }, - { "measureDistance", "Click for distance measurement", null }, - { "measureAngle", "Click for angle measurement", null }, - { "measureTorsion", "Click for torsion (dihedral) measurement", null }, - { "measureDelete", "Delete measurements", null }, - { "measureList", "List measurements", null }, - { "distanceNanometers", "Distance units nanometers", null }, - { "distanceAngstroms", "Distance units Angstroms", null }, - { "distancePicometers", "Distance units picometers", null }, + { "measureMenu", GT._("Measurement") }, + { "measureOff", GT._("Double-Click begins and ends all measurements") }, + { "measureDistance", GT._("Click for distance measurement") }, + { "measureAngle", GT._("Click for angle measurement") }, + { "measureTorsion", GT._("Click for torsion (dihedral) measurement") }, + { "measureDelete", GT._("Delete measurements") }, + { "measureList", GT._("List measurements") }, + { "distanceNanometers", GT._("Distance units nanometers") }, + { "distanceAngstroms", GT._("Distance units Angstroms") }, + { "distancePicometers", GT._("Distance units picometers") }, - { "pickingMenu", "Set picking", null }, - { "pickOff", "Off", null }, - { "pickCenter", "Center", null }, - // { "pickDraw" , "moves arrows", null }, - { "pickLabel", "Label", null }, - { "pickAtom", "Select atom", null }, - { "pickPDBChain", "Select chain", null }, - { "pickElement", "Select element", null }, - { "pickPDBGroup", "Select group", null }, - { "pickMolecule", "Select molecule", null }, - { "pickSYMMETRYSite", "Select site", null }, - { "pickSpin", "Spin", null }, + { "pickingMenu", GT._("Set picking") }, + { "pickOff", GT._("Off") }, + { "pickCenter", GT._("Center") }, + // { "pickDraw" , GT._("moves arrows") }, + { "pickLabel", GT._("Label") }, + { "pickAtom", GT._("Select atom") }, + { "pickPDBChain", GT._("Select chain") }, + { "pickElement", GT._("Select element") }, + { "pickPDBGroup", GT._("Select group") }, + { "pickMolecule", GT._("Select molecule") }, + { "pickSYMMETRYSite", GT._("Select site") }, + { "pickSpin", GT._("Spin") }, - { "showMenu", "Show", null }, - { "showConsole", "Console", null }, - { "showFile", "File Contents", null }, - { "showFileHeader", "File Header", null }, - { "showHistory", "History", null }, - { "showIsosurface", "Isosurface JVXL data", null }, - { "showMeasure", "Measure", null }, - { "showMo", "Molecular orbital JVXL data", null }, - { "showModel", "Model", null }, - { "showOrient", "Orientation", null }, - { "showSpacegroup", "Space group", null }, - { "SYMMETRYshowSymmetry", "Symmetry", null }, - { "showState", "Current state", null }, - { "SYMMETRYComputedMenu", "Symmetry", null }, - { "showUnitCell", "Unit cell", null }, - { "extractMOL", "Extract MOL data", null }, + { "showMenu", GT._("Show") }, + { "showConsole", GT._("Console") }, + { "showFile", GT._("File Contents") }, + { "showFileHeader", GT._("File Header") }, + { "showHistory", GT._("History") }, + { "showIsosurface", GT._("Isosurface JVXL data") }, + { "showMeasure", GT._("Measure") }, + { "showMo", GT._("Molecular orbital JVXL data") }, + { "showModel", GT._("Model") }, + { "showOrient", GT._("Orientation") }, + { "showSpacegroup", GT._("Space group") }, + { "SYMMETRYshowSymmetry", GT._("Symmetry") }, + { "showState", GT._("Current state") }, + { "SYMMETRYComputedMenu", GT._("Symmetry") }, + { "showUnitCell", GT._("Unit cell") }, + { "extractMOL", GT._("Extract MOL data") }, - { "surfaceMenu", "Surfaces", null }, - { "surfDots", "Dot Surface", null }, - { "surfVDW", "van der Waals Surface", null }, - { "surfMolecular", "Molecular Surface", null }, - { "surfSolvent14", "Solvent Surface ({0}-Angstrom probe)", "1.4"}, - { "surfSolventAccessible14", - "Solvent-Accessible Surface (VDW + {0} Angstrom)", "1.4"}, - { "CHARGEsurfMEP", "Molecular Electrostatic Potential", null }, - { "surfMoComputedMenu", "Molecular Orbitals", null }, - { "surfOpaque", "Make Opaque", null }, - { "surfTranslucent", "Make Translucent", null }, - { "surfOff", "Off", null }, + { "surfaceMenu", GT._("Surfaces") }, + { "surfDots", GT._("Dot Surface") }, + { "surfVDW", GT._("van der Waals Surface") }, + { "surfMolecular", GT._("Molecular Surface") }, + { "surfSolvent14", GT._("Solvent Surface ({0}-Angstrom probe)", "1.4") }, + { "surfSolventAccessible14", + GT._("Solvent-Accessible Surface (VDW + {0} Angstrom)", "1.4") }, + { "CHARGEsurfMEP", GT._("Molecular Electrostatic Potential") }, + { "surfMoComputedMenu", GT._("Molecular Orbitals") }, + { "surfOpaque", GT._("Make Opaque") }, + { "surfTranslucent", GT._("Make Translucent") }, + { "surfOff", GT._("Off") }, - { "SYMMETRYunitCellMenu", "Symmetry", null }, - { "oneUnitCell", "Reload {0}", "{1 1 1}" }, - { "nineUnitCells", "Reload {0}", "{444 666 1}" }, - { "nineUnitCellsRestricted", "Reload {0}", "{444 666 1};display 555" }, - { "nineUnitCellsPoly", "Reload + Polyhedra", null }, - + { "SYMMETRYunitCellMenu", GT._("Symmetry") }, + { "oneUnitCell", GT._("Reload {0}", "{1 1 1}") }, + { "nineUnitCells", GT._("Reload {0}", "{444 666 1}") }, + { "nineUnitCellsRestricted", GT._("Reload {0}", "{444 666 1};display 555") }, + { "nineUnitCellsPoly", GT._("Reload + Polyhedra") }, + - { "_AxesMenu", "Axes", null }, { "_BoundBoxMenu", "Boundbox", null }, - { "_UnitCellMenu", "Unitcell", null }, + { "_AxesMenu", GT._("Axes") }, { "_BoundBoxMenu", GT._("Boundbox") }, + { "_UnitCellMenu", GT._("Unitcell") }, - { "off", "Hide", null }, { "dotted", "Dotted", null }, + { "off", GT._("Hide") }, { "dotted", GT._("Dotted") }, - { "byPixelMenu", "Pixel Width", null }, - { "1p", "{0} px", "1" }, - { "3p", "{0} px", "3" }, - { "5p", "{0} px", "5" }, - { "10p", "{0} px", "10" }, + { "byPixelMenu", GT._("Pixel Width") }, { "1p", GT._("{0} px", "1") }, + { "3p", GT._("{0} px", "3") }, { "5p", GT._("{0} px", "5") }, + { "10p", GT._("{0} px", "10") }, - { "byAngstromMenu", "Angstrom Width", null }, - { "10a", "{0} \u00C5", "0.10" }, - { "20a", "{0} \u00C5", "0.20" }, - { "25a", "{0} \u00C5", "0.25" }, - { "50a", "{0} \u00C5", "0.50" }, - { "100a", "{0} \u00C5", "1.0" }, + { "byAngstromMenu", GT._("Angstrom Width") }, + { "10a", GT._("{0} \u00C5", "0.10") }, + { "20a", GT._("{0} \u00C5", "0.20") }, + { "25a", GT._("{0} \u00C5", "0.25") }, + { "50a", GT._("{0} \u00C5", "0.50") }, + { "100a", GT._("{0} \u00C5", "1.0") }, - { "optionsMenu", "Compatibility", null }, - { "showSelectionsCheckbox", "Selection Halos", null }, - { "showHydrogensCheckbox", "Show Hydrogens", null }, - { "showMeasurementsCheckbox", "Show Measurements", null }, - { "perspectiveDepthCheckbox", "Perspective Depth", null }, - { "showBoundBoxCheckbox", "Bound Box", null }, - { "showAxes;set_axesMolecularCheckbox", "Axes", null }, - { "showUnitCellCheckbox", "Unit Cell", null }, - { "rasmolChimeCompatibility", "RasMol/Chime Settings", null }, - { "colorrasmolCheckbox", "RasMol Colors", null }, - { "axesOrientationRasmolCheckbox", "Axes RasMol/Chime", null }, - { "zeroBasedXyzRasmolCheckbox", "Zero-Based Xyz Rasmol", null }, + { "optionsMenu", GT._("Compatibility") }, + { "showSelectionsCheckbox", GT._("Selection Halos") }, + { "showHydrogensCheckbox", GT._("Show Hydrogens") }, + { "showMeasurementsCheckbox", GT._("Show Measurements") }, + { "perspectiveDepthCheckbox", GT._("Perspective Depth") }, + { "showBoundBoxCheckbox", GT._("Bound Box") }, + { "showAxes;set_axesMolecularCheckbox", GT._("Axes") }, + { "showUnitCellCheckbox", GT._("Unit Cell") }, + { "rasmolChimeCompatibility", GT._("RasMol/Chime Settings") }, + { "colorrasmolCheckbox", GT._("RasMol Colors") }, + { "axesOrientationRasmolCheckbox", GT._("Axes RasMol/Chime") }, + { "zeroBasedXyzRasmolCheckbox", GT._("Zero-Based Xyz Rasmol") }, - { "languageComputedMenu", "Language", null }, - { "aboutComputedMenu", "About Jmol", null }, - { "jmolUrl", "http://www.jmol.org" }, - { "mouseManualUrl", "Mouse Manual", null }, - { "translatingUrl", "Translations", null }, }; + { "languageComputedMenu", GT._("Language") }, + { "aboutComputedMenu", GT._("About Jmol") }, + { "jmolUrl", "http://www.jmol.org" }, + { "mouseManualUrl", GT._("Mouse Manual") }, + { "translatingUrl", GT._("Translations") }, }; public static void resetMenu() { for (int i = 0; i < wordContents.length; i++) { String[] info = wordContents[i]; - String data; - switch (info.length) { - case 2: - data = info[1]; - break; - case 3: - data = (info[2] == null ? GT._(info[1]) : GT._(info[1], info[2])); - break; - case 4: - data = (info[2] == null ? GT._(info[1]) : GT._(info[1], info[2])) - + info[3]; - break; - default: - Logger.error("Error in menu for " + info[0]); - data = info[0]; + String data = info[1]; + boolean doReplace = (data.indexOf("{") >= 0); + int ipt = data.indexOf("|"); + if (data.charAt(0) == '_') { + data = org.jmol.i18n.GT._(data.substring(1)); + } else if (ipt >= 0) { + String trailer = data.substring(ipt + 1); + data = data.substring(0, ipt); + if (doReplace) + data = org.jmol.i18n.GT._(data, trailer); + else + data = org.jmol.i18n.GT._(data) + trailer; } words.setProperty(info[0], data); } @@ -869,5 +869,7 @@ /* for (int i = 0; i < wordContents.length; i++) { words.setProperty(wordContents[i][0], wordContents[i][1]); } -*/ } +*/ + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-05 13:55:35
|
Revision: 7579 http://svn.sourceforge.net/jmol/?rev=7579&view=rev Author: hansonr Date: 2007-05-05 06:55:33 -0700 (Sat, 05 May 2007) Log Message: ----------- 11.1.32 fixing GT._ calls so that xgettext can find string literals again AND forcing translations of menu regardless of setting of doTranslate in the applet (present for proper callback parsing) Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-05 13:52:52 UTC (rev 7578) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-05 13:55:33 UTC (rev 7579) @@ -843,14 +843,14 @@ boolean doReplace = (data.indexOf("{") >= 0); int ipt = data.indexOf("|"); if (data.charAt(0) == '_') { - data = org.jmol.i18n.GT._(data.substring(1)); + data = org.jmol.i18n.GT._(data.substring(1), true); } else if (ipt >= 0) { String trailer = data.substring(ipt + 1); data = data.substring(0, ipt); if (doReplace) - data = org.jmol.i18n.GT._(data, trailer); + data = org.jmol.i18n.GT._(data, trailer, true); else - data = org.jmol.i18n.GT._(data) + trailer; + data = org.jmol.i18n.GT._(data,true) + trailer; } words.setProperty(info[0], data); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-05 14:07:02
|
Revision: 7580 http://svn.sourceforge.net/jmol/?rev=7580&view=rev Author: hansonr Date: 2007-05-05 07:06:58 -0700 (Sat, 05 May 2007) Log Message: ----------- 11.1.32 comment added explaining the situation in PopupResourceBundle Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-05 13:55:33 UTC (rev 7579) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-05 14:06:58 UTC (rev 7580) @@ -474,6 +474,18 @@ { "mouseManualUrl", "http://wiki.jmol.org/index.php/Mouse_Manual" }, { "translatingUrl", "http://wiki.jmol.org/index.php/Internationalisation" }, }; + // Initialize structure properties + static { + String previous = ""; + for (int i = 0; i < structureContents.length; i++) { + String str = structureContents[i][1]; + if (str == null) + str = previous; + previous = str; + structure.setProperty(structureContents[i][0], str); + } + } + private static final String[][] wordContents = { { "modelSetMenu", GT._("No atoms loaded") }, { "CONFIGURATIONComputedMenu", GT._("Configurations") }, @@ -836,6 +848,32 @@ { "mouseManualUrl", GT._("Mouse Manual") }, { "translatingUrl", GT._("Translations") }, }; +/* Note: The above GT._ calls are to org.jmol.popup.GT._() + * That class simply tags the messages for later processing (below). + * The constructor for PopupResourceBundle now calls resetMenu(), so + * whenever a language is selected, the initializer takes care of + * creating String[][] wordContents in an efficient manner, and + * we can still do the language localization. + * + * In a sense, what I am accomplishing by this is a separation of + * internationalization (in the wordContents static initialization) + * and localization (in public static void resetMenu) + * + * The problem with the old way is that static initialization is only + * carried out once for a class. (I think I have that right.) So if + * we were to call org.jmol.i18n.GT._ directly, we get just one shot at + * it. + * + * And the problem with putting it all in a method is that you can't use + * array contents syntax within a method for creating a static structure. + * + * So this proposal is a happy medium -- wordContents is constructed + * as a static class; the GT._ calls are caught be xgettext properly, + * and in the end we can still localize on the fly. + * + * Bob Hanson 5/2007 + * + */ public static void resetMenu() { for (int i = 0; i < wordContents.length; i++) { String[] info = wordContents[i]; @@ -856,20 +894,4 @@ } } - // Initialize properties - static { - String previous = ""; - for (int i = 0; i < structureContents.length; i++) { - String str = structureContents[i][1]; - if (str == null) - str = previous; - previous = str; - structure.setProperty(structureContents[i][0], str); - } -/* for (int i = 0; i < wordContents.length; i++) { - words.setProperty(wordContents[i][0], wordContents[i][1]); - } -*/ - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-05 20:30:02
|
Revision: 7590 http://svn.sourceforge.net/jmol/?rev=7590&view=rev Author: hansonr Date: 2007-05-05 13:29:40 -0700 (Sat, 05 May 2007) Log Message: ----------- 11.1.32 refactored to do localization on the fly properly and simply Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-05 20:12:14 UTC (rev 7589) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-05-05 20:29:40 UTC (rev 7590) @@ -49,7 +49,7 @@ // Properties to store menu structure and contents private final static Properties structure = new Properties(); - private Properties words = new Properties(); + private final static Properties words = new Properties(); final static String INHERIT = "none"; final static String COLOR = "black white red orange yellow green cyan blue indigo violet"; @@ -477,374 +477,375 @@ } } - private String[][] wordContents; - - private void localize() { + private static void localize() { boolean wasTranslating = GT.getDoTranslate(); if (!wasTranslating) GT.setDoTranslate(true); - wordContents = new String[][] { - { "modelSetMenu", GT._("No atoms loaded") }, - { "CONFIGURATIONComputedMenu", GT._("Configurations") }, - { "hiddenModelSetName", GT._("Model information") }, + String[] wordContents = new String[] { + "modelSetMenu", GT._("No atoms loaded"), + "CONFIGURATIONComputedMenu", GT._("Configurations"), + "hiddenModelSetName", GT._("Model information"), - { "selectMenu", GT._("Select") }, - { "elementsComputedMenu", GT._("Element") }, - { "selectAll", GT._("All") }, - { "selectNone", GT._("None") }, - { "hideNotSelected;hide(none)Checkbox", GT._("Display Selected Only") }, - { "invertSelection", GT._("Invert Selection") }, + "selectMenu", GT._("Select"), + "elementsComputedMenu", GT._("Element"), + "selectAll", GT._("All"), + "selectNone", GT._("None"), + "hideNotSelected;hide(none)Checkbox", GT._("Display Selected Only"), + "invertSelection", GT._("Invert Selection"), - { "viewMenu", GT._("View") }, - { "front", GT._("Front") }, - { "left", GT._("Left") }, - { "right", GT._("Right") }, - { "top", GT._("Top") }, - { "bottom", GT._("Bottom") }, - { "back", GT._("Back") }, + "viewMenu", GT._("View"), + "front", GT._("Front"), + "left", GT._("Left"), + "right", GT._("Right"), + "top", GT._("Top"), + "bottom", GT._("Bottom"), + "back", GT._("Back"), - { "PDBproteinMenu", GT._("Protein") }, - { "allProtein", GT._("All") }, - { "proteinBackbone", GT._("Backbone") }, - { "proteinSideChains", GT._("Side Chains") }, - { "polar", GT._("Polar Residues") }, - { "nonpolar", GT._("Nonpolar Residues") }, - { "positiveCharge", GT._("Basic Residues (+)") }, - { "negativeCharge", GT._("Acidic Residues (-)") }, - { "noCharge", GT._("Uncharged Residues") }, - { "PDBaaResiduesComputedMenu", GT._("By Residue Name") }, - { "PDBnucleicResiduesComputedMenu", GT._("By Residue Name") }, - { "PDBcarboResiduesComputedMenu", GT._("By Residue Name") }, - { "PDBheteroComputedMenu", GT._("By HETATM") }, - { "PDBnucleicMenu", GT._("Nucleic") }, - { "allNucleic", GT._("All") }, - { "DNA", GT._("DNA") }, - { "RNA", GT._("RNA") }, - { "nucleicBackbone", GT._("Backbone") }, - { "nucleicBases", GT._("Bases") }, - { "atPairs", GT._("AT pairs") }, - { "gcPairs", GT._("GC pairs") }, - { "auPairs", GT._("AU pairs") }, - { "PDBheteroMenu", GT._("Hetero") }, - { "allHetero", GT._("All PDB \"HETATM\"") }, - { "Solvent", GT._("All Solvent") }, - { "Water", GT._("All Water") }, - { "nonWaterSolvent", - GT._("Nonaqueous Solvent") + " (solvent and not water)" }, - { "exceptWater", GT._("Nonaqueous HETATM") + " (hetero and not water)" }, - { "Ligand", GT._("Ligand") + " (hetero and not solvent)" }, + "PDBproteinMenu", GT._("Protein"), + "allProtein", GT._("All"), + "proteinBackbone", GT._("Backbone"), + "proteinSideChains", GT._("Side Chains"), + "polar", GT._("Polar Residues"), + "nonpolar", GT._("Nonpolar Residues"), + "positiveCharge", GT._("Basic Residues (+)"), + "negativeCharge", GT._("Acidic Residues (-)"), + "noCharge", GT._("Uncharged Residues"), + "PDBaaResiduesComputedMenu", GT._("By Residue Name"), + "PDBnucleicResiduesComputedMenu", GT._("By Residue Name"), + "PDBcarboResiduesComputedMenu", GT._("By Residue Name"), + "PDBheteroComputedMenu", GT._("By HETATM"), + "PDBnucleicMenu", GT._("Nucleic"), + "allNucleic", GT._("All"), + "DNA", GT._("DNA"), + "RNA", GT._("RNA"), + "nucleicBackbone", GT._("Backbone"), + "nucleicBases", GT._("Bases"), + "atPairs", GT._("AT pairs"), + "gcPairs", GT._("GC pairs"), + "auPairs", GT._("AU pairs"), + "PDBheteroMenu", GT._("Hetero"), + "allHetero", GT._("All PDB \"HETATM\""), + "Solvent", GT._("All Solvent"), + "Water", GT._("All Water"), + "nonWaterSolvent", + GT._("Nonaqueous Solvent") + " (solvent and not water)", + "exceptWater", GT._("Nonaqueous HETATM") + " (hetero and not water)", + "Ligand", GT._("Ligand") + " (hetero and not solvent)", - { "allCarbo", GT._("All") }, - { "PDBcarboMenu", GT._("Carbohydrate") }, - { "PDBnoneOfTheAbove", GT._("None of the above") }, + "allCarbo", GT._("All"), + "PDBcarboMenu", GT._("Carbohydrate"), + "PDBnoneOfTheAbove", GT._("None of the above"), - { "FRAMESbyModelComputedMenu", GT._("Model/Frame") }, + "FRAMESbyModelComputedMenu", GT._("Model/Frame"), - { "renderMenu", GT._("Style") }, - { "renderSchemeMenu", GT._("Scheme") }, - { "renderCpkSpacefill", GT._("CPK Spacefill") }, - { "renderBallAndStick", GT._("Ball and Stick") }, - { "renderSticks", GT._("Sticks") }, - { "renderWireframe", GT._("Wireframe") }, - { "renderPDBCartoonsOnly", GT._("Cartoon") }, - { "renderPDBTraceOnly", GT._("Trace") }, + "renderMenu", GT._("Style"), + "renderSchemeMenu", GT._("Scheme"), + "renderCpkSpacefill", GT._("CPK Spacefill"), + "renderBallAndStick", GT._("Ball and Stick"), + "renderSticks", GT._("Sticks"), + "renderWireframe", GT._("Wireframe"), + "renderPDBCartoonsOnly", GT._("Cartoon"), + "renderPDBTraceOnly", GT._("Trace"), - { "atomMenu", GT._("Atoms") }, - { "atomNone", GT._("Off") }, - { "atom15", GT._("{0}% van der Waals", "15") }, - { "atom20", GT._("{0}% van der Waals", "20") }, - { "atom25", GT._("{0}% van der Waals", "25") }, - { "atom50", GT._("{0}% van der Waals", "50") }, - { "atom75", GT._("{0}% van der Waals", "75") }, - { "atom100", GT._("{0}% van der Waals", "100") }, + "atomMenu", GT._("Atoms"), + "atomNone", GT._("Off"), + "atom15", GT._("{0}% van der Waals", "15"), + "atom20", GT._("{0}% van der Waals", "20"), + "atom25", GT._("{0}% van der Waals", "25"), + "atom50", GT._("{0}% van der Waals", "50"), + "atom75", GT._("{0}% van der Waals", "75"), + "atom100", GT._("{0}% van der Waals", "100"), - { "bondMenu", GT._("Bonds") }, - { "bondNone", GT._("Off") }, - { "bondWireframe", GT._("On") }, - { "bond100", GT._("{0} \u00C5", "0.10") }, - { "bond150", GT._("{0} \u00C5", "0.15") }, - { "bond200", GT._("{0} \u00C5", "0.20") }, - { "bond250", GT._("{0} \u00C5", "0.25") }, - { "bond300", GT._("{0} \u00C5", "0.30") }, + "bondMenu", GT._("Bonds"), + "bondNone", GT._("Off"), + "bondWireframe", GT._("On"), + "bond100", GT._("{0} \u00C5", "0.10"), + "bond150", GT._("{0} \u00C5", "0.15"), + "bond200", GT._("{0} \u00C5", "0.20"), + "bond250", GT._("{0} \u00C5", "0.25"), + "bond300", GT._("{0} \u00C5", "0.30"), - { "hbondMenu", GT._("Hydrogen Bonds") }, - { "hbondNone", GT._("Off") }, - { "PDBhbondCalc", GT._("Calculate") }, - { "hbondWireframe", GT._("On") }, - { "PDBhbondSidechain", GT._("Set H-Bonds Side Chain") }, - { "PDBhbondBackbone", GT._("Set H-Bonds Backbone") }, - { "hbond100", GT._("{0} \u00C5", "0.10") }, - { "hbond150", GT._("{0} \u00C5", "0.15") }, - { "hbond200", GT._("{0} \u00C5", "0.20") }, - { "hbond250", GT._("{0} \u00C5", "0.25") }, - { "hbond300", GT._("{0} \u00C5", "0.30") }, + "hbondMenu", GT._("Hydrogen Bonds"), + "hbondNone", GT._("Off"), + "PDBhbondCalc", GT._("Calculate"), + "hbondWireframe", GT._("On"), + "PDBhbondSidechain", GT._("Set H-Bonds Side Chain"), + "PDBhbondBackbone", GT._("Set H-Bonds Backbone"), + "hbond100", GT._("{0} \u00C5", "0.10"), + "hbond150", GT._("{0} \u00C5", "0.15"), + "hbond200", GT._("{0} \u00C5", "0.20"), + "hbond250", GT._("{0} \u00C5", "0.25"), + "hbond300", GT._("{0} \u00C5", "0.30"), - { "ssbondMenu", GT._("Disulfide Bonds") }, - { "ssbondNone", GT._("Off") }, - { "ssbondWireframe", GT._("On") }, - { "PDBssbondSidechain", GT._("Set SS-Bonds Side Chain") }, - { "PDBssbondBackbone", GT._("Set SS-Bonds Backbone") }, - { "ssbond100", GT._("{0} \u00C5", "0.10") }, - { "ssbond150", GT._("{0} \u00C5", "0.15") }, - { "ssbond200", GT._("{0} \u00C5", "0.20") }, - { "ssbond250", GT._("{0} \u00C5", "0.25") }, - { "ssbond300", GT._("{0} \u00C5", "0.30") }, + "ssbondMenu", GT._("Disulfide Bonds"), + "ssbondNone", GT._("Off"), + "ssbondWireframe", GT._("On"), + "PDBssbondSidechain", GT._("Set SS-Bonds Side Chain"), + "PDBssbondBackbone", GT._("Set SS-Bonds Backbone"), + "ssbond100", GT._("{0} \u00C5", "0.10"), + "ssbond150", GT._("{0} \u00C5", "0.15"), + "ssbond200", GT._("{0} \u00C5", "0.20"), + "ssbond250", GT._("{0} \u00C5", "0.25"), + "ssbond300", GT._("{0} \u00C5", "0.30"), - { "PDBstructureMenu", GT._("Structures") }, - { "structureNone", GT._("Off") }, - { "backbone", GT._("Backbone") }, - { "cartoon", GT._("Cartoon") }, - { "cartoonRockets", GT._("Cartoon Rockets") }, - { "ribbons", GT._("Ribbons") }, - { "rockets", GT._("Rockets") }, - { "strands", GT._("Strands") }, - { "trace", GT._("Trace") }, + "PDBstructureMenu", GT._("Structures"), + "structureNone", GT._("Off"), + "backbone", GT._("Backbone"), + "cartoon", GT._("Cartoon"), + "cartoonRockets", GT._("Cartoon Rockets"), + "ribbons", GT._("Ribbons"), + "rockets", GT._("Rockets"), + "strands", GT._("Strands"), + "trace", GT._("Trace"), - { "VIBRATIONMenu", GT._("Vibration") }, - { "vibrationOff", GT._("Off") }, - { "vibrationOn", GT._("On") }, - { "VIBRATIONvectorMenu", GT._("Vectors") }, - { "vectorOff", GT._("Off") }, - { "vectorOn", GT._("On") }, - { "vector3", GT._("{0} pixels", "3") }, - { "vector005", GT._("{0} \u00C5", "0.05") }, - { "vector01", GT._("{0} \u00C5", "0.10") }, - { "vectorScale02", GT._("Scale {0}", "0.2") }, - { "vectorScale05", GT._("Scale {0}", "0.5") }, - { "vectorScale1", GT._("Scale {0}", "1") }, - { "vectorScale2", GT._("Scale {0}", "2") }, - { "vectorScale5", GT._("Scale {0}", "5") }, + "VIBRATIONMenu", GT._("Vibration"), + "vibrationOff", GT._("Off"), + "vibrationOn", GT._("On"), + "VIBRATIONvectorMenu", GT._("Vectors"), + "vectorOff", GT._("Off"), + "vectorOn", GT._("On"), + "vector3", GT._("{0} pixels", "3"), + "vector005", GT._("{0} \u00C5", "0.05"), + "vector01", GT._("{0} \u00C5", "0.10"), + "vectorScale02", GT._("Scale {0}", "0.2"), + "vectorScale05", GT._("Scale {0}", "0.5"), + "vectorScale1", GT._("Scale {0}", "1"), + "vectorScale2", GT._("Scale {0}", "2"), + "vectorScale5", GT._("Scale {0}", "5"), - { "stereoMenu", GT._("Stereographic") }, - { "stereoNone", GT._("None") }, - { "stereoRedCyan", GT._("Red+Cyan glasses") }, - { "stereoRedBlue", GT._("Red+Blue glasses") }, - { "stereoRedGreen", GT._("Red+Green glasses") }, - { "stereoCrossEyed", GT._("Cross-eyed viewing") }, - { "stereoWallEyed", GT._("Wall-eyed viewing") }, + "stereoMenu", GT._("Stereographic"), + "stereoNone", GT._("None"), + "stereoRedCyan", GT._("Red+Cyan glasses"), + "stereoRedBlue", GT._("Red+Blue glasses"), + "stereoRedGreen", GT._("Red+Green glasses"), + "stereoCrossEyed", GT._("Cross-eyed viewing"), + "stereoWallEyed", GT._("Wall-eyed viewing"), - { "labelMenu", GT._("Labels") }, + "labelMenu", GT._("Labels"), - { "labelNone", GT._("None") }, - { "labelSymbol", GT._("With Element Symbol") }, - { "labelName", GT._("With Atom Name") }, - { "labelNumber", GT._("With Atom Number") }, + "labelNone", GT._("None"), + "labelSymbol", GT._("With Element Symbol"), + "labelName", GT._("With Atom Name"), + "labelNumber", GT._("With Atom Number"), - { "labelPositionMenu", GT._("Position Label on Atom") }, - { "labelCentered", GT._("Centered") }, - { "labelUpperRight", GT._("Upper Right") }, - { "labelLowerRight", GT._("Lower Right") }, - { "labelUpperLeft", GT._("Upper Left") }, - { "labelLowerLeft", GT._("Lower Left") }, + "labelPositionMenu", GT._("Position Label on Atom"), + "labelCentered", GT._("Centered"), + "labelUpperRight", GT._("Upper Right"), + "labelLowerRight", GT._("Lower Right"), + "labelUpperLeft", GT._("Upper Left"), + "labelLowerLeft", GT._("Lower Left"), - { "colorMenu", GT._("Color") }, - { "colorAtomsMenu", GT._("Atoms") }, + "colorMenu", GT._("Color"), + "colorAtomsMenu", GT._("Atoms"), - { "SchemeMenu", GT._("By Scheme") }, - { "cpk", GT._("Element (CPK)") }, - { "altloc", GT._("Alternative Location") }, - { "molecule", GT._("Molecule") }, - { "formalcharge", GT._("Formal Charge") }, - { "partialCHARGE", GT._("Partial Charge") }, + "SchemeMenu", GT._("By Scheme"), + "cpk", GT._("Element (CPK)"), + "altloc", GT._("Alternative Location"), + "molecule", GT._("Molecule"), + "formalcharge", GT._("Formal Charge"), + "partialCHARGE", GT._("Partial Charge"), - { "amino#PDB", GT._("Amino Acid") }, - { "structure#PDB", GT._("Secondary Structure") }, - { "chain#PDB", GT._("Chain") }, + "amino#PDB", GT._("Amino Acid"), + "structure#PDB", GT._("Secondary Structure"), + "chain#PDB", GT._("Chain"), - { "none", GT._("Inherit") }, - { "black", GT._("Black") }, - { "white", GT._("White") }, - { "cyan", GT._("Cyan") }, + "none", GT._("Inherit"), + "black", GT._("Black"), + "white", GT._("White"), + "cyan", GT._("Cyan"), - { "red", GT._("Red") }, - { "orange", GT._("Orange") }, - { "yellow", GT._("Yellow") }, - { "green", GT._("Green") }, - { "blue", GT._("Blue") }, - { "indigo", GT._("Indigo") }, - { "violet", GT._("Violet") }, + "red", GT._("Red"), + "orange", GT._("Orange"), + "yellow", GT._("Yellow"), + "green", GT._("Green"), + "blue", GT._("Blue"), + "indigo", GT._("Indigo"), + "violet", GT._("Violet"), - { "salmon", GT._("Salmon") }, - { "olive", GT._("Olive") }, - { "maroon", GT._("Maroon") }, - { "gray", GT._("Gray") }, - { "slateblue", GT._("Slate Blue") }, - { "gold", GT._("Gold") }, - { "orchid", GT._("Orchid") }, + "salmon", GT._("Salmon"), + "olive", GT._("Olive"), + "maroon", GT._("Maroon"), + "gray", GT._("Gray"), + "slateblue", GT._("Slate Blue"), + "gold", GT._("Gold"), + "orchid", GT._("Orchid"), - { "opaque", GT._("Make Opaque") }, - { "translucent", GT._("Make Translucent") }, + "opaque", GT._("Make Opaque"), + "translucent", GT._("Make Translucent"), - { "colorBondsMenu", GT._("Bonds") }, - { "colorHbondsMenu", GT._("Hydrogen Bonds") }, - { "colorSSbondsMenu", GT._("Disulfide Bonds") }, - { "colorPDBstructuresMenu", GT._("Structure") }, - { "colorBackboneMenu", GT._("Backbone") }, - { "colorTraceMenu", GT._("Trace") }, - { "colorCartoonsMenu", GT._("Cartoon") }, - { "colorRibbonsMenu", GT._("Ribbons") }, - { "colorRocketsMenu", GT._("Rockets") }, - { "colorStrandsMenu", GT._("Strands") }, - { "colorLabelsMenu", GT._("Labels") }, - { "colorBackgroundMenu", GT._("Background") }, - { "colorIsoSurfaceMenu", GT._("Surface") }, - { "colorVectorsMenu", GT._("Vectors") }, - { "colorAxesMenu", GT._("Axes") }, - { "colorBoundBoxMenu", GT._("Boundbox") }, - { "colorUnitCellMenu", GT._("Unitcell") }, + "colorBondsMenu", GT._("Bonds"), + "colorHbondsMenu", GT._("Hydrogen Bonds"), + "colorSSbondsMenu", GT._("Disulfide Bonds"), + "colorPDBstructuresMenu", GT._("Structure"), + "colorBackboneMenu", GT._("Backbone"), + "colorTraceMenu", GT._("Trace"), + "colorCartoonsMenu", GT._("Cartoon"), + "colorRibbonsMenu", GT._("Ribbons"), + "colorRocketsMenu", GT._("Rockets"), + "colorStrandsMenu", GT._("Strands"), + "colorLabelsMenu", GT._("Labels"), + "colorBackgroundMenu", GT._("Background"), + "colorIsoSurfaceMenu", GT._("Surface"), + "colorVectorsMenu", GT._("Vectors"), + "colorAxesMenu", GT._("Axes"), + "colorBoundBoxMenu", GT._("Boundbox"), + "colorUnitCellMenu", GT._("Unitcell"), - { "zoomMenu", GT._("Zoom") }, - { "zoom50", "50%" }, - { "zoom100", "100%" }, - { "zoom150", "150%" }, - { "zoom200", "200%" }, - { "zoom400", "400%" }, - { "zoom800", "800%" }, - { "zoomIn", GT._("Zoom In") }, - { "zoomOut", GT._("Zoom Out") }, + "zoomMenu", GT._("Zoom"), + "zoom50", "50%", + "zoom100", "100%", + "zoom150", "150%", + "zoom200", "200%", + "zoom400", "400%", + "zoom800", "800%", + "zoomIn", GT._("Zoom In"), + "zoomOut", GT._("Zoom Out"), - { "spinMenu", GT._("Spin") }, - { "spinOn", GT._("On") }, - { "spinOff", GT._("Off") }, + "spinMenu", GT._("Spin"), + "spinOn", GT._("On"), + "spinOff", GT._("Off"), - { "setSpinXMenu", GT._("Set X Rate") }, - { "setSpinYMenu", GT._("Set Y Rate") }, - { "setSpinZMenu", GT._("Set Z Rate") }, - { "setSpinFpsMenu", GT._("Set FPS") }, + "setSpinXMenu", GT._("Set X Rate"), + "setSpinYMenu", GT._("Set Y Rate"), + "setSpinZMenu", GT._("Set Z Rate"), + "setSpinFpsMenu", GT._("Set FPS"), - { "s0", "0" }, - { "s5", "5" }, - { "s10", "10" }, - { "s20", "20" }, - { "s30", "30" }, - { "s40", "40" }, - { "s50", "50" }, + "s0", "0", + "s5", "5", + "s10", "10", + "s20", "20", + "s30", "30", + "s40", "40", + "s50", "50", - { "FRAMESanimateMenu", GT._("Animation") }, - { "animModeMenu", GT._("Animation Mode") }, - { "onceThrough", GT._("Play Once") }, - { "palindrome", GT._("Palindrome") }, - { "loop", GT._("Loop") }, + "FRAMESanimateMenu", GT._("Animation"), + "animModeMenu", GT._("Animation Mode"), + "onceThrough", GT._("Play Once"), + "palindrome", GT._("Palindrome"), + "loop", GT._("Loop"), - { "play", GT._("Play") }, - { "pause", GT._("Pause") }, - { "resume", GT._("Resume") }, - { "stop", GT._("Stop") }, - { "nextframe", GT._("Next Frame") }, - { "prevframe", GT._("Previous Frame") }, - { "rewind", GT._("Rewind") }, - { "playrev", GT._("Reverse") }, - { "restart", GT._("Restart") }, + "play", GT._("Play"), + "pause", GT._("Pause"), + "resume", GT._("Resume"), + "stop", GT._("Stop"), + "nextframe", GT._("Next Frame"), + "prevframe", GT._("Previous Frame"), + "rewind", GT._("Rewind"), + "playrev", GT._("Reverse"), + "restart", GT._("Restart"), - { "FRAMESanimFpsMenu", GT._("Set FPS") }, - { "animfps5", "5" }, - { "animfps10", "10" }, - { "animfps20", "20" }, - { "animfps30", "30" }, - { "animfps50", "50" }, + "FRAMESanimFpsMenu", GT._("Set FPS"), + "animfps5", "5", + "animfps10", "10", + "animfps20", "20", + "animfps30", "30", + "animfps50", "50", - { "measureMenu", GT._("Measurement") }, - { "measureOff", GT._("Double-Click begins and ends all measurements") }, - { "measureDistance", GT._("Click for distance measurement") }, - { "measureAngle", GT._("Click for angle measurement") }, - { "measureTorsion", GT._("Click for torsion (dihedral) measurement") }, - { "measureDelete", GT._("Delete measurements") }, - { "measureList", GT._("List measurements") }, - { "distanceNanometers", GT._("Distance units nanometers") }, - { "distanceAngstroms", GT._("Distance units Angstroms") }, - { "distancePicometers", GT._("Distance units picometers") }, + "measureMenu", GT._("Measurement"), + "measureOff", GT._("Double-Click begins and ends all measurements"), + "measureDistance", GT._("Click for distance measurement"), + "measureAngle", GT._("Click for angle measurement"), + "measureTorsion", GT._("Click for torsion (dihedral) measurement"), + "measureDelete", GT._("Delete measurements"), + "measureList", GT._("List measurements"), + "distanceNanometers", GT._("Distance units nanometers"), + "distanceAngstroms", GT._("Distance units Angstroms"), + "distancePicometers", GT._("Distance units picometers"), - { "pickingMenu", GT._("Set picking") }, - { "pickOff", GT._("Off") }, - { "pickCenter", GT._("Center") }, - // { "pickDraw" , GT._("moves arrows") }, - { "pickLabel", GT._("Label") }, - { "pickAtom", GT._("Select atom") }, - { "pickPDBChain", GT._("Select chain") }, - { "pickElement", GT._("Select element") }, - { "pickPDBGroup", GT._("Select group") }, - { "pickMolecule", GT._("Select molecule") }, - { "pickSYMMETRYSite", GT._("Select site") }, - { "pickSpin", GT._("Spin") }, + "pickingMenu", GT._("Set picking"), + "pickOff", GT._("Off"), + "pickCenter", GT._("Center"), + // "pickDraw" , GT._("moves arrows"), + "pickLabel", GT._("Label"), + "pickAtom", GT._("Select atom"), + "pickPDBChain", GT._("Select chain"), + "pickElement", GT._("Select element"), + "pickPDBGroup", GT._("Select group"), + "pickMolecule", GT._("Select molecule"), + "pickSYMMETRYSite", GT._("Select site"), + "pickSpin", GT._("Spin"), - { "showMenu", GT._("Show") }, - { "showConsole", GT._("Console") }, - { "showFile", GT._("File Contents") }, - { "showFileHeader", GT._("File Header") }, - { "showHistory", GT._("History") }, - { "showIsosurface", GT._("Isosurface JVXL data") }, - { "showMeasure", GT._("Measure") }, - { "showMo", GT._("Molecular orbital JVXL data") }, - { "showModel", GT._("Model") }, - { "showOrient", GT._("Orientation") }, - { "showSpacegroup", GT._("Space group") }, - { "SYMMETRYshowSymmetry", GT._("Symmetry") }, - { "showState", GT._("Current state") }, - { "SYMMETRYComputedMenu", GT._("Symmetry") }, - { "showUnitCell", GT._("Unit cell") }, - { "extractMOL", GT._("Extract MOL data") }, + "showMenu", GT._("Show"), + "showConsole", GT._("Console"), + "showFile", GT._("File Contents"), + "showFileHeader", GT._("File Header"), + "showHistory", GT._("History"), + "showIsosurface", GT._("Isosurface JVXL data"), + "showMeasure", GT._("Measure"), + "showMo", GT._("Molecular orbital JVXL data"), + "showModel", GT._("Model"), + "showOrient", GT._("Orientation"), + "showSpacegroup", GT._("Space group"), + "SYMMETRYshowSymmetry", GT._("Symmetry"), + "showState", GT._("Current state"), + "SYMMETRYComputedMenu", GT._("Symmetry"), + "showUnitCell", GT._("Unit cell"), + "extractMOL", GT._("Extract MOL data"), - { "surfaceMenu", GT._("Surfaces") }, - { "surfDots", GT._("Dot Surface") }, - { "surfVDW", GT._("van der Waals Surface") }, - { "surfMolecular", GT._("Molecular Surface") }, - { "surfSolvent14", GT._("Solvent Surface ({0}-Angstrom probe)", "1.4") }, - { "surfSolventAccessible14", - GT._("Solvent-Accessible Surface (VDW + {0} Angstrom)", "1.4") }, - { "CHARGEsurfMEP", GT._("Molecular Electrostatic Potential") }, - { "surfMoComputedMenu", GT._("Molecular Orbitals") }, - { "surfOpaque", GT._("Make Opaque") }, - { "surfTranslucent", GT._("Make Translucent") }, - { "surfOff", GT._("Off") }, + "surfaceMenu", GT._("Surfaces"), + "surfDots", GT._("Dot Surface"), + "surfVDW", GT._("van der Waals Surface"), + "surfMolecular", GT._("Molecular Surface"), + "surfSolvent14", GT._("Solvent Surface ({0}-Angstrom probe)", "1.4"), + "surfSolventAccessible14", + GT._("Solvent-Accessible Surface (VDW + {0} Angstrom)", "1.4"), + "CHARGEsurfMEP", GT._("Molecular Electrostatic Potential"), + "surfMoComputedMenu", GT._("Molecular Orbitals"), + "surfOpaque", GT._("Make Opaque"), + "surfTranslucent", GT._("Make Translucent"), + "surfOff", GT._("Off"), - { "SYMMETRYunitCellMenu", GT._("Symmetry") }, - { "oneUnitCell", GT._("Reload {0}", "{1 1 1}") }, - { "nineUnitCells", GT._("Reload {0}", "{444 666 1}") }, - { "nineUnitCellsRestricted", GT._("Reload {0}", "{444 666 1};display 555") }, - { "nineUnitCellsPoly", GT._("Reload + Polyhedra") }, + "SYMMETRYunitCellMenu", GT._("Symmetry"), + "oneUnitCell", GT._("Reload {0}", "{1 1 1}"), + "nineUnitCells", GT._("Reload {0}", "{444 666 1}"), + "nineUnitCellsRestricted", GT._("Reload {0}", "{444 666 1};display 555"), + "nineUnitCellsPoly", GT._("Reload + Polyhedra"), - { "_AxesMenu", GT._("Axes") }, { "_BoundBoxMenu", GT._("Boundbox") }, - { "_UnitCellMenu", GT._("Unitcell") }, + "_AxesMenu", GT._("Axes"), + "_BoundBoxMenu", GT._("Boundbox"), + "_UnitCellMenu", GT._("Unitcell"), - { "off", GT._("Hide") }, { "dotted", GT._("Dotted") }, + "off", GT._("Hide"), + "dotted", GT._("Dotted"), - { "byPixelMenu", GT._("Pixel Width") }, { "1p", GT._("{0} px", "1") }, - { "3p", GT._("{0} px", "3") }, { "5p", GT._("{0} px", "5") }, - { "10p", GT._("{0} px", "10") }, + "byPixelMenu", GT._("Pixel Width"), + "1p", GT._("{0} px", "1"), + "3p", GT._("{0} px", "3"), + "5p", GT._("{0} px", "5"), + "10p", GT._("{0} px", "10"), - { "byAngstromMenu", GT._("Angstrom Width") }, - { "10a", GT._("{0} \u00C5", "0.10") }, - { "20a", GT._("{0} \u00C5", "0.20") }, - { "25a", GT._("{0} \u00C5", "0.25") }, - { "50a", GT._("{0} \u00C5", "0.50") }, - { "100a", GT._("{0} \u00C5", "1.0") }, + "byAngstromMenu", GT._("Angstrom Width"), + "10a", GT._("{0} \u00C5", "0.10"), + "20a", GT._("{0} \u00C5", "0.20"), + "25a", GT._("{0} \u00C5", "0.25"), + "50a", GT._("{0} \u00C5", "0.50"), + "100a", GT._("{0} \u00C5", "1.0"), - { "optionsMenu", GT._("Compatibility") }, - { "showSelectionsCheckbox", GT._("Selection Halos") }, - { "showHydrogensCheckbox", GT._("Show Hydrogens") }, - { "showMeasurementsCheckbox", GT._("Show Measurements") }, - { "perspectiveDepthCheckbox", GT._("Perspective Depth") }, - { "showBoundBoxCheckbox", GT._("Bound Box") }, - { "showAxes;set_axesMolecularCheckbox", GT._("Axes") }, - { "showUnitCellCheckbox", GT._("Unit Cell") }, - { "rasmolChimeCompatibility", GT._("RasMol/Chime Settings") }, - { "colorrasmolCheckbox", GT._("RasMol Colors") }, - { "axesOrientationRasmolCheckbox", GT._("Axes RasMol/Chime") }, - { "zeroBasedXyzRasmolCheckbox", GT._("Zero-Based Xyz Rasmol") }, + "optionsMenu", GT._("Compatibility"), + "showSelectionsCheckbox", GT._("Selection Halos"), + "showHydrogensCheckbox", GT._("Show Hydrogens"), + "showMeasurementsCheckbox", GT._("Show Measurements"), + "perspectiveDepthCheckbox", GT._("Perspective Depth"), + "showBoundBoxCheckbox", GT._("Bound Box"), + "showAxes;set_axesMolecularCheckbox", GT._("Axes"), + "showUnitCellCheckbox", GT._("Unit Cell"), + "rasmolChimeCompatibility", GT._("RasMol/Chime Settings"), + "colorrasmolCheckbox", GT._("RasMol Colors"), + "axesOrientationRasmolCheckbox", GT._("Axes RasMol/Chime"), + "zeroBasedXyzRasmolCheckbox", GT._("Zero-Based Xyz Rasmol"), - { "languageComputedMenu", GT._("Language") }, - { "aboutComputedMenu", GT._("About Jmol") }, - { "jmolUrl", "http://www.jmol.org" }, - { "mouseManualUrl", GT._("Mouse Manual") }, - { "translatingUrl", GT._("Translations") }, + "languageComputedMenu", GT._("Language"), + "aboutComputedMenu", GT._("About Jmol"), + "jmolUrl", "http://www.jmol.org", + "mouseManualUrl", GT._("Mouse Manual"), + "translatingUrl", GT._("Translations"), }; if (!wasTranslating) GT.setDoTranslate(wasTranslating); - for (int i = 0; i < wordContents.length; i++) { - words.setProperty(wordContents[i][0], wordContents[i][1]); - } + for (int i = 0; i < wordContents.length;) + words.setProperty(wordContents[i++], wordContents[i++]); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-09-02 20:00:31
|
Revision: 8194 http://jmol.svn.sourceforge.net/jmol/?rev=8194&view=rev Author: nicove Date: 2007-09-02 13:00:03 -0700 (Sun, 02 Sep 2007) Log Message: ----------- Warning Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java Modified: trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-09-02 19:56:29 UTC (rev 8193) +++ trunk/Jmol/src/org/jmol/popup/PopupResourceBundle.java 2007-09-02 20:00:03 UTC (rev 8194) @@ -519,10 +519,10 @@ return; BufferedReader br = new BufferedReader(new StringReader(slist)); String line; - char ch; + //char ch; try { while ((line = br.readLine()) != null) { - if (line.length() == 0 || (ch = line.charAt(0)) == '#') + if (line.length() == 0 || (/*ch = */line.charAt(0)) == '#') continue; int pt = line.indexOf("="); if (pt < 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |