[jsword-svn] r1760 - in trunk: bibledesktop/etc/installer/win32 bibledesktop/etc/jnlp bibledesktop-web/src/web bibledesktop-web/src/web/stable common/src/main/java/org/crosswire/common/util jsword/src/main/java/org/crosswire/jsword/book/install jsword/src/main/java/org/crosswire/jsword/book/sword jsword/src/main/java/org/crosswire/jsword/examples jsword-web/src/web
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sun Feb 10 06:44:30 MST 2008
Author: dmsmith
Date: 2008-02-10 06:44:30 -0700 (Sun, 10 Feb 2008)
New Revision: 1760
Modified:
trunk/bibledesktop-web/src/web/maillists.html
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.7.jnlp
trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties
trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties
trunk/jsword-web/src/web/index.html
trunk/jsword-web/src/web/maillists.html
trunk/jsword-web/src/web/template.xsl
trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java
Log:
Changed Crosswire to CrossWire.
Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktopSetup.nsi 2008-02-10 13:44:30 UTC (rev 1760)
@@ -3,7 +3,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "BibleDesktop"
!define PRODUCT_VERSION "@release.version@"
-!define PRODUCT_PUBLISHER "Crosswire Bible Society"
+!define PRODUCT_PUBLISHER "CrossWire Bible Society"
!define PRODUCT_WEB_SITE "http://www.crosswire.org/bibledesktop/index.html"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2008-02-10 13:44:30 UTC (rev 1760)
@@ -3,7 +3,7 @@
<information>
<title>Bible Desktop</title>
- <vendor>Crosswire Bible Society</vendor>
+ <vendor>CrossWire Bible Society</vendor>
<homepage href="@jnlp.homepage@"/>
<description>Bible Desktop v at release.version@ - Bible Study Software based on the Sword project</description>
<description kind="short">Bible Desktop is a Bible study package available over the internet</description>
Modified: trunk/bibledesktop-web/src/web/maillists.html
===================================================================
--- trunk/bibledesktop-web/src/web/maillists.html 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/bibledesktop-web/src/web/maillists.html 2008-02-10 13:44:30 UTC (rev 1760)
@@ -11,7 +11,7 @@
<p>
There are a number of Bible Desktop / JSword related mailing lists hosted at
- Crosswire. Mail to all of them is restricted to subscribers to reduce spam.
+ CrossWire. Mail to all of them is restricted to subscribers to reduce spam.
</p>
<table border="1" cellspacing="0" cellpadding="5">
Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.7.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.7.jnlp 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.7.jnlp 2008-02-10 13:44:30 UTC (rev 1760)
@@ -3,7 +3,7 @@
<information>
<title>Bible Desktop</title>
- <vendor>Crosswire Bible Society</vendor>
+ <vendor>CrossWire Bible Society</vendor>
<homepage href="http://www.crosswire.org/bibledesktop"/>
<description>Bible Desktop v1.0.7 - Bible Study Software based on the Sword project</description>
<description kind="short">Bible Desktop is a Bible study package available over the internet</description>
Modified: trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties 2008-02-10 13:44:30 UTC (rev 1760)
@@ -1,4 +1,4 @@
-# These are all the languages of the Sword modules currently maintained at Crosswire
+# These are all the languages of the Sword modules currently maintained at CrossWire
# and for which we have Bible name translations
# as of July 30, 2007
af=Afrikaans
Modified: trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties 2008-02-10 13:44:30 UTC (rev 1760)
@@ -1,4 +1,4 @@
-# These are all the languages of the Sword modules currently maintained at Crosswire
+# These are all the languages of the Sword modules currently maintained at CrossWire
# and for which we have Bible name translations
# as of July 30, 2007
af=Afrikaans
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.properties 2008-02-10 13:44:30 UTC (rev 1760)
@@ -1,18 +1,4 @@
-# Format is as follows:
-# Each key is of the form: Installer.n, where n is a unique number.
-# Each value is of the form:
-# driver,label,host,zip path,catalog path,index path,proxyHost,proxyPort
-# a value may be empty
-# The drivers are defined in InstallerFactory.properties and in each installer.
-# The Crosswire main "production" download site
-Installer.1=sword-http,Crosswire,www.crosswire.org,/ftpmirror/pub/sword/packages/rawzip,/ftpmirror/pub/sword/raw,,,
-
-#FTP is no longer supported
-#Installer.1=sword-ftp,Crosswire,ftp.crosswire.org,/pub/sword/raw,,
-
-# Install site for NET bible
+Installer.1=sword-http,CrossWire,www.crosswire.org,/ftpmirror/pub/sword/packages/rawzip,/ftpmirror/pub/sword/raw,,,
Installer.2=sword-http,Bible.org,ftp.bible.org,/sword/packages/rawzip,/sword/raw,,,
-
-# The Crosswire beta area is not set up correctly
Installer.3=sword-http,Crosswire Beta,www.crosswire.org,/ftpmirror/pub/sword/betapackages/rawzip,/ftpmirror/pub/sword/betaraw,,,
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2008-02-10 13:44:30 UTC (rev 1760)
@@ -670,7 +670,7 @@
};
/**
- * Similar to DataPath. It gives where on the Crosswire server the book can be found.
+ * Similar to DataPath. It gives where on the CrossWire server the book can be found.
* Informational only.
*/
public static final ConfigEntryType DISTRIBUTION_SOURCE = new ConfigEntryType("DistributionSource") //$NON-NLS-1$
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java 2008-02-10 13:44:30 UTC (rev 1760)
@@ -317,7 +317,7 @@
}
// If we know the name of the installer we can get it directly
- installer = imanager.getInstaller("Crosswire"); //$NON-NLS-1$
+ installer = imanager.getInstaller("CrossWire"); //$NON-NLS-1$
// Now we can get the list of books
try
Modified: trunk/jsword-web/src/web/index.html
===================================================================
--- trunk/jsword-web/src/web/index.html 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/jsword-web/src/web/index.html 2008-02-10 13:44:30 UTC (rev 1760)
@@ -69,7 +69,7 @@
<table cellpadding="10">
<tr>
- <td><a href="/"><img src="logos/crosswire.gif" width="123" height="37" border="0" alt="Crosswire Logo"/></a></td>
+ <td><a href="/"><img src="logos/crosswire.gif" width="123" height="37" border="0" alt="CrossWire Logo"/></a></td>
<td>
The CrossWire Bible Society is an organization with the purpose to sponsor and provide a place for engineers and others to come and collaborate on free, open-source projects aimed at furthering the Kingdom of our God.
CrossWire is a non-income organization, which means that not only do we offer our services for free, but we also do not solicit donations to exist. We exist because we, as a community come together and offer our services and time freely.
Modified: trunk/jsword-web/src/web/maillists.html
===================================================================
--- trunk/jsword-web/src/web/maillists.html 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/jsword-web/src/web/maillists.html 2008-02-10 13:44:30 UTC (rev 1760)
@@ -11,7 +11,7 @@
<p>
There are a number of JSword / Bible Desktop related mailing lists hosted at
- Crosswire. Mail to all of them is restricted to subscribers to reduce spam.
+ CrossWire. Mail to all of them is restricted to subscribers to reduce spam.
</p>
<table border="1" cellspacing="0" cellpadding="5">
Modified: trunk/jsword-web/src/web/template.xsl
===================================================================
--- trunk/jsword-web/src/web/template.xsl 2008-02-10 05:05:09 UTC (rev 1759)
+++ trunk/jsword-web/src/web/template.xsl 2008-02-10 13:44:30 UTC (rev 1760)
@@ -35,7 +35,7 @@
<table width="100%">
<tr align="center">
- <td class="navbutton" align="center"><a href="/">Crosswire</a></td>
+ <td class="navbutton" align="center"><a href="/">CrossWire</a></td>
<td class="navbutton" align="center"><a href="index.html">JSword</a></td>
<td class="navbutton" align="center"><a href="/bibledesktop">BibleDesktop</a></td>
<td class="navbutton" align="center"><a href="/sword/">Sword</a></td>
@@ -120,7 +120,7 @@
</ul>
<p>Other Projects</p>
<ul>
- <li><a href="/">Crosswire</a></li>
+ <li><a href="/">CrossWire</a></li>
<li><a href="/sword">Sword</a></li>
<li><a href="http://www.sourceforge.net/projects/projectb/">Project-B</a></li>
</ul>
More information about the jsword-svn
mailing list