|
From: <mig...@us...> - 2006-03-27 14:57:21
|
Revision: 4769 Author: migueljmol Date: 2006-03-27 06:57:12 -0800 (Mon, 27 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4769&view=rev Log Message: ----------- selectively bring r4453rollback up through 4465 Modified Paths: -------------- branches/r4453rollback/Jmol/src/org/jmol/applet/Jmol.java branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/ca.po branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/de.po branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/es.po branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/et.po branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/fr.po branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/nl.po branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/pt.po branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java Modified: branches/r4453rollback/Jmol/src/org/jmol/applet/Jmol.java =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/applet/Jmol.java 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/applet/Jmol.java 2006-03-27 14:57:12 UTC (rev 4769) @@ -115,8 +115,7 @@ } static String appletInfo = - GT._("Jmol Applet. Part of the OpenScience project. " + - "See http://www.jmol.org for more information"); + GT._("Jmol Molecular Visualization http://www.jmol.org"); public void setAppletWrapper(AppletWrapper appletWrapper) { this.appletWrapper = appletWrapper; Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/JmolApplet.pot 2006-03-27 14:57:12 UTC (rev 4769) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -17,20 +17,18 @@ "Content-Transfer-Encoding: 8bit\n" #: org/jmol/applet/Jmol.java:118 -msgid "" -"Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for " -"more information" +msgid "Jmol Molecular Visualization http://www.jmol.org" msgstr "" -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "" -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "" -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "" Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/ca.po =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/ca.po 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/ca.po 2006-03-27 14:57:12 UTC (rev 4769) @@ -1,4 +1,3 @@ - # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -7,7 +6,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" "PO-Revision-Date: 2006-01-30 03:37+0100\n" "Last-Translator: Toni Hermoso Pulido <to...@so...>\n" "Language-Team: Catalan <Jmo...@li...>\n" @@ -18,18 +17,18 @@ "X-Poedit-Country: ANDORRA\n" #: org/jmol/applet/Jmol.java:118 -msgid "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for more information" -msgstr "Miniaplicació Jmol. Part del projecte OpenScience. Consulteu http://www.jmol.org per a més informació" +msgid "Jmol Molecular Visualization http://www.jmol.org" +msgstr "" -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "El Jmol està executant la seqüència..." -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "Error de fitxer:" -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "La seqüència de Jmol s'ha completat" @@ -960,4 +959,20 @@ msgid "Translations" msgstr "Traduccions" +#, fuzzy +#~ msgid "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "An OpenScience project.\n" +#~ "\n" +#~ "See http://www.jmol.org for more information" +#~ msgstr "" +#~ "Miniaplicació Jmol. Part del projecte OpenScience. Consulteu http://www." +#~ "jmol.org per a més informació" +#~ msgid "" +#~ "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org " +#~ "for more information" +#~ msgstr "" +#~ "Miniaplicació Jmol. Part del projecte OpenScience. Consulteu http://www." +#~ "jmol.org per a més informació" Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/de.po =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/de.po 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/de.po 2006-03-27 14:57:12 UTC (rev 4769) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: JmolApplet 10\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" "PO-Revision-Date: 2005-12-21 19:44+0100\n" "Last-Translator: Daniel Leidert <dle...@us...>\n" "Language-Team: none\n" @@ -17,22 +17,18 @@ "Content-Transfer-Encoding: 8bit\n" #: org/jmol/applet/Jmol.java:118 -msgid "" -"Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for " -"more information" +msgid "Jmol Molecular Visualization http://www.jmol.org" msgstr "" -"Jmol-Applet - Teil des OpenScience-Projekts. Mehr Informationen " -"unter http://www.jmol.org." -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "Jmol führt Skript aus ..." -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "Datei-Fehler:" -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "Jmol-Skript ausgeführt" @@ -962,3 +958,21 @@ #: org/jmol/popup/PopupResourceBundle.java:1175 msgid "Translations" msgstr "Übersetzungen" + +#, fuzzy +#~ msgid "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "An OpenScience project.\n" +#~ "\n" +#~ "See http://www.jmol.org for more information" +#~ msgstr "" +#~ "Jmol-Applet - Teil des OpenScience-Projekts. Mehr Informationen unter " +#~ "http://www.jmol.org." + +#~ msgid "" +#~ "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org " +#~ "for more information" +#~ msgstr "" +#~ "Jmol-Applet - Teil des OpenScience-Projekts. Mehr Informationen unter " +#~ "http://www.jmol.org." Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/es.po =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/es.po 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/es.po 2006-03-27 14:57:12 UTC (rev 4769) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" "PO-Revision-Date: 2005-12-17 12:46+0100\n" "Last-Translator: Angel Herráez <ang...@ua...>\n" "Language-Team: Spanish <Jmo...@li...>\n" @@ -14,18 +14,18 @@ "X-Poedit-SourceCharset: utf-8\n" #: org/jmol/applet/Jmol.java:118 -msgid "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for more information" -msgstr "Miniaplicación Jmol, parte del proyecto OpenScience; para más información, vea http://www.jmol.org" +msgid "Jmol Molecular Visualization http://www.jmol.org" +msgstr "" -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "Jmol ejecutando un guión..." -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "Error de archivo:" -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "Guión de Jmol completado" @@ -956,3 +956,20 @@ msgid "Translations" msgstr "Traducciones" +#, fuzzy +#~ msgid "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "An OpenScience project.\n" +#~ "\n" +#~ "See http://www.jmol.org for more information" +#~ msgstr "" +#~ "Miniaplicación Jmol, parte del proyecto OpenScience; para más " +#~ "información, vea http://www.jmol.org" + +#~ msgid "" +#~ "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org " +#~ "for more information" +#~ msgstr "" +#~ "Miniaplicación Jmol, parte del proyecto OpenScience; para más " +#~ "información, vea http://www.jmol.org" Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/et.po =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/et.po 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/et.po 2006-03-27 14:57:12 UTC (rev 4769) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" "PO-Revision-Date: 2005-08-12 19:18+0100\n" "Last-Translator: Nicolas Vervelle <ni...@us...>\n" "Language-Team: Estonian <Jmo...@li...>\n" @@ -19,22 +19,18 @@ "X-Poedit-Basepath: ../../../..\n" #: org/jmol/applet/Jmol.java:118 -msgid "" -"Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for " -"more information" +msgid "Jmol Molecular Visualization http://www.jmol.org" msgstr "" -"Jmol Applet. On osa OpenScience projektist. Täpsemalt vaata http://www.jmol." -"org" -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "Jmol käivitab skripti ..." -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "Faili viga:" -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "Jmol skript sai täidetud" @@ -964,3 +960,21 @@ #: org/jmol/popup/PopupResourceBundle.java:1175 msgid "Translations" msgstr "" + +#, fuzzy +#~ msgid "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "An OpenScience project.\n" +#~ "\n" +#~ "See http://www.jmol.org for more information" +#~ msgstr "" +#~ "Jmol Applet. On osa OpenScience projektist. Täpsemalt vaata http://www." +#~ "jmol.org" + +#~ msgid "" +#~ "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org " +#~ "for more information" +#~ msgstr "" +#~ "Jmol Applet. On osa OpenScience projektist. Täpsemalt vaata http://www." +#~ "jmol.org" Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/fr.po =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/fr.po 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/fr.po 2006-03-27 14:57:12 UTC (rev 4769) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" -"PO-Revision-Date: 2005-10-12 21:39+0100\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" +"PO-Revision-Date: 2006-02-06 22:48+0100\n" "Last-Translator: Nicolas Vervelle <ni...@us...>\n" "Language-Team: French <Jmo...@li...>\n" "MIME-Version: 1.0\n" @@ -19,22 +19,18 @@ "X-Poedit-Basepath: ../../../..\n" #: org/jmol/applet/Jmol.java:118 -msgid "" -"Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for " -"more information" +msgid "Jmol Molecular Visualization http://www.jmol.org" msgstr "" -"Jmol Applet. Fait partie du projet OpenScience. Voir http://www.jmol.org " -"pour de plus amples informations" -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "Jmol exécute un script ..." -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "Erreur de Fichier:" -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "Script Jmol terminé" @@ -964,3 +960,16 @@ #: org/jmol/popup/PopupResourceBundle.java:1175 msgid "Translations" msgstr "Traductions" + +#~ msgid "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "An OpenScience project.\n" +#~ "\n" +#~ "See http://www.jmol.org for more information" +#~ msgstr "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "Fait partie du projet OpenScience.\n" +#~ "\n" +#~ "Voir http://www.jmol.org pour de plus amples informations" Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/nl.po =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/nl.po 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/nl.po 2006-03-27 14:57:12 UTC (rev 4769) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" "PO-Revision-Date: 2005-10-08 19:41+0100\n" "Last-Translator: Nicolas Vervelle <ni...@us...>\n" "Language-Team: Nederlands <kde...@kd...>\n" @@ -20,22 +20,18 @@ "X-Generator: KBabel 1.10\n" #: org/jmol/applet/Jmol.java:118 -msgid "" -"Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for " -"more information" +msgid "Jmol Molecular Visualization http://www.jmol.org" msgstr "" -"Jmol Applet. Onderdeel van het OpenScience project. Zie http://www.jmol.org " -"voor meer informatie." -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "Jmol voert script uit ..." -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "Bestandsfout:" -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "Jmol script is klaar" @@ -965,3 +961,21 @@ #: org/jmol/popup/PopupResourceBundle.java:1175 msgid "Translations" msgstr "" + +#, fuzzy +#~ msgid "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "An OpenScience project.\n" +#~ "\n" +#~ "See http://www.jmol.org for more information" +#~ msgstr "" +#~ "Jmol Applet. Onderdeel van het OpenScience project. Zie http://www.jmol." +#~ "org voor meer informatie." + +#~ msgid "" +#~ "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org " +#~ "for more information" +#~ msgstr "" +#~ "Jmol Applet. Onderdeel van het OpenScience project. Zie http://www.jmol." +#~ "org voor meer informatie." Modified: branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/pt.po =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/pt.po 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/translation/JmolApplet/pt.po 2006-03-27 14:57:12 UTC (rev 4769) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Jmol\n" "Report-Msgid-Bugs-To: jmo...@li...\n" -"POT-Creation-Date: 2005-11-27 15:53-0500\n" +"POT-Creation-Date: 2006-03-27 09:56-0500\n" "PO-Revision-Date: 2005-12-20 07:44-0000\n" "Last-Translator: Metro <por...@gm...>\n" "Language-Team: Portugal@Folding <Jmo...@li...>\n" @@ -18,22 +18,18 @@ "X-Poedit-Basepath: ../../../..\n" #: org/jmol/applet/Jmol.java:118 -msgid "" -"Jmol Applet. Part of the OpenScience project. See http://www.jmol.org for " -"more information" +msgid "Jmol Molecular Visualization http://www.jmol.org" msgstr "" -"Jmol Applet. Parte do projecto OpenScience. Visite http://www.jmol.org para " -"mais informação" -#: org/jmol/applet/Jmol.java:455 +#: org/jmol/applet/Jmol.java:454 msgid "Jmol executing script ..." msgstr "Jmol está a executar o script..." -#: org/jmol/applet/Jmol.java:550 +#: org/jmol/applet/Jmol.java:549 msgid "File Error:" msgstr "Erro no ficheiro..." -#: org/jmol/applet/Jmol.java:579 +#: org/jmol/applet/Jmol.java:578 msgid "Jmol script completed" msgstr "Script Jmol completo" @@ -964,6 +960,24 @@ msgid "Translations" msgstr "" +#, fuzzy +#~ msgid "" +#~ "Jmol Applet version {0} {1}.\n" +#~ "\n" +#~ "An OpenScience project.\n" +#~ "\n" +#~ "See http://www.jmol.org for more information" +#~ msgstr "" +#~ "Jmol Applet. Parte do projecto OpenScience. Visite http://www.jmol.org " +#~ "para mais informação" + +#~ msgid "" +#~ "Jmol Applet. Part of the OpenScience project. See http://www.jmol.org " +#~ "for more information" +#~ msgstr "" +#~ "Jmol Applet. Parte do projecto OpenScience. Visite http://www.jmol.org " +#~ "para mais informação" + #~ msgid "15% vanderWaals" #~ msgstr "15% vanderWaals" Modified: branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java 2006-03-27 14:25:20 UTC (rev 4768) +++ branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java 2006-03-27 14:57:12 UTC (rev 4769) @@ -706,7 +706,7 @@ if (strFormat == null || strFormat.equals("")) return null; String strLabel = ""; - int cch = strFormat.length(); + //int cch = strFormat.length(); int ich, ichPercent; for (ich = 0; (ichPercent = strFormat.indexOf('%', ich)) != -1; ) { if (ich != ichPercent) @@ -834,9 +834,9 @@ strT = "%" + ch; } if (floatIsSet) { - strLabel += format(floatT, width, precision, alignLeft); + strLabel += format(floatT, width, precision, alignLeft, zeroPad); } else { - strLabel += format(strT, width, precision, alignLeft); + strLabel += format(strT, width, precision, alignLeft, zeroPad); } } catch (IndexOutOfBoundsException ioobe) { ich = ichPercent; @@ -850,14 +850,14 @@ } String format(float value, int width, int precision, - boolean alignLeft) { + boolean alignLeft, boolean zeroPad) { return format(group.chain.frame.viewer.formatDecimal(value, precision), - width, 0, alignLeft); + width, 0, alignLeft, zeroPad); } static String format(String value, int width, int precision, - boolean alignLeft) { - if (precision > value.length()) + boolean alignLeft, boolean zeroPad) { + if (precision > value.length()) value = value.substring(0, precision); int padLength = width - value.length(); if (padLength <= 0) @@ -866,7 +866,7 @@ if (alignLeft) sb.append(value); for (int i = padLength; --i >= 0; ) - sb.append(' '); + sb.append((!alignLeft && zeroPad) ? '0' : ' '); if (! alignLeft) sb.append(value); return "" + sb; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |