Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
Conflicts:
	build.xml
	licenses/license.TXT
	nbproject/build-impl.xml
	nbproject/build-uno-impl.xml
	nbproject/genfiles.properties
	nbproject/project-uno.properties
	nbproject/project.properties
	nbproject/project.xml
	registry/data/org/openoffice/Office/Addons.xcu
	src/description.xml
	src/io/bibleget/BibleGetAbout.form
	src/io/bibleget/BibleGetAbout.java
	src/io/bibleget/BibleGetDB.java
	src/io/bibleget/BibleGetFrame.java
	src/io/bibleget/BibleGetHelp.form
	src/io/bibleget/BibleGetHelp.java
	src/io/bibleget/BibleGetI18N.java
	src/io/bibleget/BibleGetIO.java
	src/io/bibleget/BibleGetJSON.java
	src/io/bibleget/BibleGetSelection.java
	src/io/bibleget/CentralRegistrationClass.java
	src/io/bibleget/HTTPCaller.java
	src/io/bibleget/Indexes.java
	src/io/bibleget/OptionsFrame.java
	src/io/bibleget/VersionsSelect.java
	src/io/bibleget/resources/messages_de.properties
	src/io/bibleget/resources/messages_el.properties
	src/io/bibleget/resources/messages_en.properties
	src/io/bibleget/resources/messages_es.properties
	src/io/bibleget/resources/messages_fr.properties
	src/io/bibleget/resources/messages_it.properties
	src/io/bibleget/resources/messages_pl.properties
	src/io/bibleget/resources/messages_sr.properties
	src/uno-extension-manifest.xml
  • Loading branch information
JohnRDOrazio committed Mar 3, 2019
2 parents 5510074 + de58f65 commit dc8d9cb
Show file tree
Hide file tree
Showing 20 changed files with 1,631 additions and 1,622 deletions.
9 changes: 9 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[main]
host = https://www.transifex.com
type = UNICODEPROPERTIES

[bibleget-io-plugin-for-open-office.messages_enproperties]
source_file = src/io/bibleget/resources/messages_en.properties
source_lang = en
type = UNICODEPROPERTIES
file_filter = src/io/bibleget/resources/messages_<lang>.properties
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<project name="BibleGetIO_LibreOffice" default="default" basedir=".">
<project name="BibleGetIO" default="default" basedir=".">
<description>Builds, tests, and runs the project extension project.</description>
<import file="nbproject/build-uno-impl.xml"/>
<!--
Expand Down
2 changes: 1 addition & 1 deletion licenses/license.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
2,898 changes: 1,449 additions & 1,449 deletions nbproject/build-impl.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nbproject/build-uno-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*** AUTOMATICALLY GENERATED - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
-->
<project name="BibleGetIO_LibreOfficeuno-impl" default="netbeans" basedir="..">
<project name="BibleGetIOuno-impl" default="netbeans" basedir="..">
<description>Builds, tests, and runs an UNO project.</description>

<import file="build-impl.xml"/>
Expand Down
16 changes: 8 additions & 8 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build.xml.data.CRC32=2b754fcd
build.xml.script.CRC32=0a20deac
build.xml.stylesheet.CRC32=d5b6853a
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=ee5af6e4
nbproject/build-impl.xml.script.CRC32=3c8001e6
nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
build.xml.data.CRC32=2b754fcd
build.xml.script.CRC32=0a20deac
build.xml.stylesheet.CRC32=d5b6853a
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=ee5af6e4
nbproject/build-impl.xml.script.CRC32=3c8001e6
nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
4 changes: 2 additions & 2 deletions nbproject/project-uno.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
uno.project.type=office.addon.project
project.name=BibleGetIO_LibreOffice
project.name=BibleGetIO
registration.classname=io.bibleget.BibleGetIO
external.jar.dir=lib
idl_types.jar=BibleGetIO_LibreOffice_IDL_types.jar
idl_types.jar=BibleGetIO_IDL_types.jar
central.registration.class=io.bibleget.CentralRegistrationClass
# extensions for files that go into the .oxt package; some are also referenced in the manifest
manifest.package.extensions=**/*.xcu,**/*.xcs,**/*.xdl,**/*.xlb,**/*.xba,**/*.properties,**/*.default
Expand Down
186 changes: 93 additions & 93 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
#Sat Mar 02 19:50:39 CET 2019
jnlp.offline-allowed=false
javadoc.splitindex=true
build.classes.excludes=**/*.java,**/*.form,**/*.xcu,**/*.xcs,**/*.idl,**/*manifest.xml
javadoc.author=true
build.sysclasspath=ignore
javac.target=1.8
build.generated.dir=${build.dir}/generated
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
application.args=
debug.test.classpath=${run.test.classpath}
jnlp.descriptor=application
build.dir=build
javac.deprecation=true
jnlp.signed=false
test.src.dir=test
junit.selected.version=4
jar.archive.disabled=${jnlp.enabled}
application.homepage=https\://www.bibleget.io
includes=**
application.vendor=JohnRDOrazio
mkdist.disabled=false
jar.compress=false
jnlp.mixed.code=default
annotation.processing.processors.list=
javac.external.vm=false
javadoc.version=true
build.classes.dir=${build.dir}/classes
dist.dir=dist
javac.source=1.8
run.jvmargs=
manifest.custom.permissions=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
build.generated.sources.dir=${build.dir}/generated-sources
jnlp.signing=
javadoc.notree=false
dist.jar=${dist.dir}/BibleGetIO_OpenOffice.jar
manifest.custom.caller.allowable.codebase=
platform.active=JDK_1.8_x86
file.reference.commons-lang3-3.8.1.jar=../../commons-lang3-3.8.1-bin/commons-lang3-3.8.1.jar
manifest.custom.application.library.allowable.codebase=
annotation.processing.enabled=true
main.class=io.bibleget.BibleGetIO
dist.javadoc.dir=${dist.dir}/javadoc
javadoc.additionalparam=
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
javac.classpath=\
${libs.JAVADB_DRIVER_LABEL.classpath}:\
${file.reference.commons-text-1.6.jar}:\
${file.reference.glazedlists-1.11.0.jar}:\
${libs.beans-binding.classpath}:\
${libs.Java-EE-GlassFish-v3-Prelude.classpath}:\
${file.reference.commons-lang3-3.8.1.jar}:\
${libs.OpenOffice 4.1.6.classpath}
javadoc.noindex=false
manifest.custom.codebase=
annotation.processing.enabled.in.editor=false
javadoc.private=false
javadoc.encoding=
build.test.classes.dir=${build.dir}/test/classes
jar.index=${jnlp.enabled}
javac.compilerargs=-Xlint\:unchecked
source.encoding=UTF-8
project.license=apache20
application.desc=Open Office Writer extension that facilitates inserting Bible quotes into a document.
jnlp.signing.keystore=
meta.inf.dir=${src.dir}/META-INF
annotation.processing.run.all.processors=true
excludes=
application.title=BibleGetIO_OpenOffice
jnlp.codebase.type=no.codebase
file.reference.glazedlists-1.11.0.jar=../../glazedlists-1.11.0.jar
file.reference.commons-text-1.6.jar=../../commons-text-1.6/commons-text-1.6.jar
javac.processorpath=\
${javac.classpath}
build.test.results.dir=${build.dir}/test/results
endorsed.classpath=
javadoc.use=true
javadoc.nonavbar=false
jnlp.signing.alias=
javadoc.windowtitle=
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${libs.junit_4.classpath}:\
${libs.hamcrest.classpath}
src.dir=src
debug.classpath=${run.classpath}
jnlp.enabled=false
#Sat Mar 02 19:50:39 CET 2019
jnlp.offline-allowed=false
javadoc.splitindex=true
build.classes.excludes=**/*.java,**/*.form,**/*.xcu,**/*.xcs,**/*.idl,**/*manifest.xml
javadoc.author=true
build.sysclasspath=ignore
javac.target=1.8
build.generated.dir=${build.dir}/generated
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
application.args=
debug.test.classpath=${run.test.classpath}
jnlp.descriptor=application
build.dir=build
javac.deprecation=true
jnlp.signed=false
test.src.dir=test
junit.selected.version=4
jar.archive.disabled=${jnlp.enabled}
application.homepage=https\://www.bibleget.io
includes=**
application.vendor=JohnRDOrazio
mkdist.disabled=false
jar.compress=false
jnlp.mixed.code=default
annotation.processing.processors.list=
javac.external.vm=false
javadoc.version=true
build.classes.dir=${build.dir}/classes
dist.dir=dist
javac.source=1.8
run.jvmargs=
manifest.custom.permissions=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
build.generated.sources.dir=${build.dir}/generated-sources
jnlp.signing=
javadoc.notree=false
dist.jar=${dist.dir}/BibleGetIO_OpenOffice.jar
manifest.custom.caller.allowable.codebase=
platform.active=JDK_1.8_x86
file.reference.commons-lang3-3.8.1.jar=../../commons-lang3-3.8.1-bin/commons-lang3-3.8.1.jar
manifest.custom.application.library.allowable.codebase=
annotation.processing.enabled=true
main.class=io.bibleget.BibleGetIO
dist.javadoc.dir=${dist.dir}/javadoc
javadoc.additionalparam=
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
javac.classpath=\
${libs.JAVADB_DRIVER_LABEL.classpath}:\
${file.reference.commons-text-1.6.jar}:\
${file.reference.glazedlists-1.11.0.jar}:\
${libs.beans-binding.classpath}:\
${libs.Java-EE-GlassFish-v3-Prelude.classpath}:\
${file.reference.commons-lang3-3.8.1.jar}:\
${libs.OpenOffice 4.1.6.classpath}
javadoc.noindex=false
manifest.custom.codebase=
annotation.processing.enabled.in.editor=false
javadoc.private=false
javadoc.encoding=
build.test.classes.dir=${build.dir}/test/classes
jar.index=${jnlp.enabled}
javac.compilerargs=-Xlint\:unchecked
source.encoding=UTF-8
project.license=apache20
application.desc=Open Office Writer extension that facilitates inserting Bible quotes into a document.
jnlp.signing.keystore=
meta.inf.dir=${src.dir}/META-INF
annotation.processing.run.all.processors=true
excludes=
application.title=BibleGetIO_OpenOffice
jnlp.codebase.type=no.codebase
file.reference.glazedlists-1.11.0.jar=../../glazedlists-1.11.0.jar
file.reference.commons-text-1.6.jar=../../commons-text-1.6/commons-text-1.6.jar
javac.processorpath=\
${javac.classpath}
build.test.results.dir=${build.dir}/test/results
endorsed.classpath=
javadoc.use=true
javadoc.nonavbar=false
jnlp.signing.alias=
javadoc.windowtitle=
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${libs.junit_4.classpath}:\
${libs.hamcrest.classpath}
src.dir=src
debug.classpath=${run.classpath}
jnlp.enabled=false
34 changes: 17 additions & 17 deletions nbproject/project.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>BibleGetIO_OpenOffice</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>BibleGetIO_OpenOffice</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>
80 changes: 40 additions & 40 deletions src/description.xml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Created with Apache OpenOffice API plug-in for NetBeans Version 2.0.6.000205-->
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="2.8"/>
<identifier value="io.bibleget.BibleGetIO"/>
<icon>
<default xlink:href="images/holy-bible-x256.png"/>
<high-contrast xlink:href="images/holy-bible-x256.png"/>
</icon>
<display-name>
<name lang="fr">BibleGet I/O</name>
<name lang="it">BibleGet I/O</name>
<name lang="en">BibleGet I/O</name>
<name lang="de">BibleGet I/O</name>
<name lang="es">BibleGet I/O</name>
</display-name>
<publisher>
<name lang="es" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="fr" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="en" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="it" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="de" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
</publisher>
<extension-description>
<src lang="fr" xlink:href="description/desc_fr.txt"/>
<src lang="it" xlink:href="description/desc_it.txt"/>
<src lang="en" xlink:href="description/desc_en.txt"/>
<src lang="de" xlink:href="description/desc_de.txt"/>
<src lang="es" xlink:href="description/desc_es.txt"/>
</extension-description>
<registration>
<simple-license accept-by="user" default-license-id="en">
<license-text lang="en" license-id="en" xlink:href="licenses/license.TXT"/>
<license-text lang="de" xlink:href="licenses/license.TXT"/>
<license-text lang="fr" xlink:href="licenses/license.TXT"/>
<license-text lang="it" xlink:href="licenses/license.TXT"/>
<license-text lang="es" xlink:href="licenses/license.TXT"/>
</simple-license>
</registration>
</description>
<?xml version="1.0" encoding="UTF-8"?>
<!--Created with Apache OpenOffice API plug-in for NetBeans Version 2.0.6.000205-->
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="2.8"/>
<identifier value="io.bibleget.BibleGetIO"/>
<icon>
<default xlink:href="images/holy-bible-x256.png"/>
<high-contrast xlink:href="images/holy-bible-x256.png"/>
</icon>
<display-name>
<name lang="fr">BibleGet I/O</name>
<name lang="it">BibleGet I/O</name>
<name lang="en">BibleGet I/O</name>
<name lang="de">BibleGet I/O</name>
<name lang="es">BibleGet I/O</name>
</display-name>
<publisher>
<name lang="es" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="fr" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="en" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="it" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
<name lang="de" xlink:href="https://www.bibleget.io">John R. D'Orazio, Giovanni Gregori, Simone Urbinati</name>
</publisher>
<extension-description>
<src lang="fr" xlink:href="description/desc_fr.txt"/>
<src lang="it" xlink:href="description/desc_it.txt"/>
<src lang="en" xlink:href="description/desc_en.txt"/>
<src lang="de" xlink:href="description/desc_de.txt"/>
<src lang="es" xlink:href="description/desc_es.txt"/>
</extension-description>
<registration>
<simple-license accept-by="user" default-license-id="en">
<license-text lang="en" license-id="en" xlink:href="licenses/license.TXT"/>
<license-text lang="de" xlink:href="licenses/license.TXT"/>
<license-text lang="fr" xlink:href="licenses/license.TXT"/>
<license-text lang="it" xlink:href="licenses/license.TXT"/>
<license-text lang="es" xlink:href="licenses/license.TXT"/>
</simple-license>
</registration>
</description>
2 changes: 1 addition & 1 deletion src/io/bibleget/BibleGetIO.java
Original file line number Diff line number Diff line change
Expand Up @@ -506,4 +506,4 @@ public com.sun.star.frame.XController getController()
public static void main(String args[]) {
}
*/
}
}
2 changes: 1 addition & 1 deletion src/io/bibleget/resources/messages_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ Choose\ Verse\ Number\ Background\ Color = Wählen Sie Vers Nummer Hintergrundfa
Choose\ Verse\ Text\ Font\ Color = Wählen Sie Vers Text Schriftfarbe
Choose\ Verse\ Text\ Background\ Color = Wählen Sie Vers Texthintergrundfarbe
Some\ Bible\ versions\ have\ their\ own\ formatting.\ This\ is\ left\ by\ default\ to\ keep\ the\ text\ as\ close\ as\ possible\ to\ the\ original.<br>\ If\ however\ you\ need\ to\ have\ consistent\ formatting\ in\ your\ document,\ you\ may\ override\ the\ Bible\ version's\ own\ formatting. = Einige Bibelübersetzungen haben ihre eigene Formatierung. Dies ist standardmäßig aktiviert , um nach links , um den Text so nahe wie möglich am Original zu halten. <br> Aber wenn Sie benötigen, um konsistente Formatierung in Ihrem Dokument haben, können Sie die Formatierung der Bibel -Version ignorieren.
Override\ Bible\ Version\ Formatting = Überschreiben Sie Bibel Version Formatierung
Override\ Bible\ Version\ Formatting = Überschreiben Sie Bibel Version Formatierung
2 changes: 1 addition & 1 deletion src/io/bibleget/resources/messages_el.properties
Original file line number Diff line number Diff line change
Expand Up @@ -193,4 +193,4 @@ Choose\ Verse\ Number\ Background\ Color = Επιλέξετε το στίχο α
Choose\ Verse\ Text\ Font\ Color = Επιλέξτε χρώμα γραμματοσειράς κειμένου στίχο
Choose\ Verse\ Text\ Background\ Color = Επιλέξτε το χρώμα φόντου κείμενο στίχο
Some\ Bible\ versions\ have\ their\ own\ formatting.\ This\ is\ left\ by\ default\ to\ keep\ the\ text\ as\ close\ as\ possible\ to\ the\ original.<br>\ If\ however\ you\ need\ to\ have\ consistent\ formatting\ in\ your\ document,\ you\ may\ override\ the\ Bible\ version's\ own\ formatting. = Ορισμένες εκδόσεις της Βίβλου έχουν τη δική τους μορφοποίηση. Αυτό έχει απομείνει από προεπιλογή για να διατηρηθεί το κείμενο όσο το δυνατόν πιο κοντά στο πρωτότυπο. <br> Εάν, ωστόσο θα πρέπει να έχετε συνεπείς μορφοποίησης στο έγγραφό σας, μπορείτε να παρακάμψετε τη μορφοποίηση τη Γραφή του εκδοχή.
Override\ Bible\ Version\ Formatting = Αγνοήστε τη μορφοποίηση από την Αγία Γραφή Έκδοση
Override\ Bible\ Version\ Formatting = Αγνοήστε τη μορφοποίηση από την Αγία Γραφή Έκδοση
2 changes: 1 addition & 1 deletion src/io/bibleget/resources/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@ Choose\ Verse\ Number\ Background\ Color = Choose Verse Number Background Color
Choose\ Verse\ Text\ Font\ Color = Choose Verse Text Font Color
Choose\ Verse\ Text\ Background\ Color = Choose Verse Text Background Color
Some\ Bible\ versions\ have\ their\ own\ formatting.\ This\ is\ left\ by\ default\ to\ keep\ the\ text\ as\ close\ as\ possible\ to\ the\ original.<br>\ If\ however\ you\ need\ to\ have\ consistent\ formatting\ in\ your\ document,\ you\ may\ override\ the\ Bible\ version's\ own\ formatting. = Some Bible versions have their own formatting. This is left by default to keep the text as close as possible to the original.<br> If however you need to have consistent formatting in your document, you may override the Bible version's own formatting.
Override\ Bible\ Version\ Formatting = Override Bible Version Formatting
Override\ Bible\ Version\ Formatting = Override Bible Version Formatting

0 comments on commit dc8d9cb

Please sign in to comment.