From 44e038bb23d56043a458c29676d8ec42ee552fe0 Mon Sep 17 00:00:00 2001 From: danglassey Date: Tue, 1 Oct 2002 13:01:39 +0000 Subject: sync with crosswire 20021001-1300 --- Makefile.in | 7 +- aclocal.m4 | 4 +- apps/Makefile.in | 2 +- apps/console/Makefile.in | 2 +- apps/console/diatheke/Makefile.in | 8 +- .../CBuilder5/BibleCS/stage/uilocales.d/id.conf | 369 +++++---- examples/Makefile.in | 2 +- examples/cmdline/Makefile.in | 2 +- icu/Makefile.in | 2 +- include/utf8transliterator.h | 14 +- lib/Makefile.in | 42 +- locales.d/id.conf | 918 +++++++++++---------- src/frontend/swlog.cpp | 37 + src/modules/filters/utf8transliterator.cpp | 14 +- src/utilfuns/Makefile.am | 2 +- tests/Makefile.in | 2 +- utilities/Makefile.in | 2 +- 17 files changed, 746 insertions(+), 683 deletions(-) diff --git a/Makefile.in b/Makefile.in index b421c00..3ddfcc3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -168,7 +168,7 @@ testlib_SOURCES = testlib.cpp @ICU_TRUE@testlib_LDADD = -L./lib -lsword -licui18n -licuuc @ICU_FALSE@testlib_LDADD = -L./lib -lsword -localeDATA = locales.d/abbr.conf locales.d/cs.conf locales.d/da.conf locales.d/de.conf locales.d/de_abbrev.conf locales.d/es.conf locales.d/fr.conf locales.d/fr_FR.ISO-8859-1.conf locales.d/it.conf locales.d/la.conf locales.d/nl.conf locales.d/no.conf locales.d/pl.conf locales.d/pt.conf locales.d/id.conf locales.d/pt_BR.conf locales.d/sk.conf locales.d/ru.conf +localeDATA = locales.d/abbr.conf locales.d/cs.conf locales.d/da.conf locales.d/de.conf locales.d/de_abbrev.conf locales.d/es.conf locales.d/fr.conf locales.d/fr_FR.ISO-8859-1.conf locales.d/it.conf locales.d/la.conf locales.d/nl.conf locales.d/no.conf locales.d/pl.conf locales.d/pt.conf locales.d/id.conf locales.d/pt_BR.conf locales.d/sk.conf locales.d/ru.conf locales.d/et.conf locales.d/et_abbr.conf localedatadir = $(pkgdatadir)/locales.d @INSTCONF_TRUE@modsDATA = samples/mods.d/globals.conf @@ -226,7 +226,8 @@ all: config.h .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile diff --git a/aclocal.m4 b/aclocal.m4 index b52e6a1..454e9d1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.6.2 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -138,7 +138,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6.2])]) + [AM_AUTOMAKE_VERSION([1.6.3])]) # Helper functions for option handling. -*- Autoconf -*- diff --git a/apps/Makefile.in b/apps/Makefile.in index e23a3c6..8f1ca6b 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff --git a/apps/console/Makefile.in b/apps/console/Makefile.in index c364a89..8009584 100644 --- a/apps/console/Makefile.in +++ b/apps/console/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff --git a/apps/console/diatheke/Makefile.in b/apps/console/diatheke/Makefile.in index b2ea29a..0a29d10 100644 --- a/apps/console/diatheke/Makefile.in +++ b/apps/console/diatheke/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -168,8 +168,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) if test -f $$p \ || test -f $$p1 \ ; then \ - p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -178,8 +177,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - f=`echo "$$f" | sed -e 's,^.*/,,'`; \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done diff --git a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf index 3415d43..0ab5ba1 100644 --- a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf +++ b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf @@ -1,179 +1,190 @@ -[Meta] -Name=id -Description=Indonesia -Translator=SABDA/YLSA - -[Text] -#BackBtnImage=uilocales.d/id_back.bmp -#SearchBtnImage=uilocales.d/id_search.bmp -&About=&Tentang SWORD/PEDANG... -About The SWORD Project=Tentang Proyek SWORD/PEDANG -&Add=&Tambah -&Add Bookmark=Tambah Bookmark -Add New Bookmark File=Tambah File Bookmark Baru -Bookmark Section Title:=Judul Bagian Bookmark: -Bookmark=Bookmark -Bookmarks=Bookmark -Cancel=Batal -Case Sensitive=Huruf Besar/Kecil Berbeda -Chapter=Pasal/Bab -Check Modules To Show As Tabs=Cek Modul yang Ditampilkan dalam Tab -Combo/Edit Fields=Field Multi/Edit -Contents=Isi -&Copy=Copy -Copy as &B-Greek Transliteration=Copy Ke Transliterasi Yunani -&Close=Tutup -Create a New Verse List Window=Membuat Jendela Daftar Ayat Baru -Create Verse List=Membuat Daftar Ayat -Current Verse Color=Warna Ayat Aktif -Daily Devotionals=Renungan Harian -Default Devotional=Renungan Standar/Default -Define Custom Range=Definisikan Batasan Khusus/Custom -Definitions=Definisi -&Delete Entry=Hapus Data -Description=Deskripsi -Devotion for Today=Renungan untuk Hari Ini -Devotional of the Day=Renungan Hari Ini -Dictionary Lookup=Cari dalam Kamus -Display Colors=Warna Tampilan -Display=Tampilkan -&Edit=&Edit -&Edit Bookmarks / Tree View...=Edit Bookmark / Sub-Bagian... -Edit Entry=Edit Tulisan/Data -&Edit Entry=Edit Tulisan/Data -"Entire Module","Current Results","Custom Range"="Dalam Satu Modul","Dalam Hasil Pencarian","Dalam Batasan Khusus" -E&xit=Keluar -eg. mat-jo;rev4=mis. mat-yoh;wah4 -&File=File -File Name (without extension):=Nama File (tanpa ekstensi/jenis): -Font Size:=Ukuran Font: -Found New Module...=Modul Baru Ditemukan... -General=Umum -Greek=Yunani -Hebrew=Ibrani -&Help=Help -- Bantuan/Info -Hide / Show Modules=Sembunyikan/Tampilkan Modul -Individual Modules (Font Only)=Modul Tersendiri (Hanya Font) -Install Manager=Program Install Manager -Language=Bahasa -Link to Comment for Verse...=Link Ke Catatan/Komentar untuk Ayat... -Maintain Custom Ranges=Mengolah Batasan Khusus -Window Type=Jenis Modul -Module=Modul -"Mult Word","Phrase","Regular Expression"="Multi-Kata","Frasa","Ekspresi/Rumus" -&New Search Window=Jendela Pencarian Baru -OK=OK -OkBtn=OkBtn -Options=Pilihan -Original Language Support - Default Modules=Dukungan untuk Bahasa Asli - Modul Standar/Default -Parsing=Uraian Kalimat/Parsing -Personalize=Kustomisasi Pribadi -Preferences=Preferensi -&Preferences...=Preferensi... -Preview=Lihat Dahulu -Preview...=Lihat Dahulu... -Range Name=Batasan Nama -Range Text=Batasan Teks -Reference=Referensi -&Remove=Hapus -&Save=Simpan -S&ave Layout=Simpan Susunan/Layout -Autosave Other Bookmarks=Simpan Bookmark Lain -Autosave Personal Bookmarks=Simpan Bookmark Pribadi -Autosave Screen Layout=Simpan Susunan/Layout Layar -Scheme=Skema -Scope=Ruang Lingkup -&Search=Cari -Search Options=Pilihan Pencarian -Search Type=Jenis Pencarian -Search...=Cari... -Search=Cari -Select Color...=Pilih Warna... -Select Font...=Pilih Font... -Show Devotional at Startup=Tampilkan Renungan di Start-up -Show Devotional Splash Screen on Startup=Tampilkan Layar Renungan Saat Start-up -Show Devotionals as Dictionaries=Tampilkan Renungan Seperti Kamus -Show Hint Over Strongs Numbers=Tampilkan Tip Nomor Strong -Show Hint Pop-ups=Tampilkan Tip Pop-up -Special Modules=Modul Khusus -Strong's Numbered Text=Teks dengan Nomor Strong -Text Styles and Colors=Font Teks -&Tools=Alat-alat -Type Verse=Ketik Ayat -User Verse List=Daftar Ayat Pengguna -Verse List=Daftar Ayat -Verse Number Color=Warna Nomor Ayat -&New Bookmark File=File Bookmark Baru -P&rint...=Cetak... -The SWORD Project=Proyek SWORD/PEDANG -&Footnotes=Catatan Kaki -&On=Hidup/On -O&ff=Mati/Off -&Hebrew Cantillation=Kantilasi/Kanonis Ibrani -H&ebrew Vowel Points=Titik/Poin Vokal Ibrani -&Strong's Numbers=Nomor Strong -&Morphological Tags= Tag Morfologi -He&adings=Bagian Kepala -&Transliteration=Transliterasi -&Latin=Bahasa Latin -&Basic Latin=Bahasa Latin (Basic/Dasar) -B&eta=Beta -B&Greek=Yunani -Print Selection=Pilihan Cetak -Print Source=Sumber Cetak -Bible Text=Teks Alkitab -Commentary Text=Teks Tafsiran/Komentar -Lexicon/Dictionary Text=Teks Leksikon/Kamus -Module Name=Nama Modul -Print Range=Batasan Cetak -Versbereich oder -liste: ********** -&Print=Cetak -&Print...=Cetak... -Print=Cetak -Print...=Cetak... -P&review=Lihat Dahulu Cetakan -P&review...=Lihat Dahulu Cetakan... -Printer&s...=Printer... -Margins (Inches)=Margin (Inci) -Top:=Atas: -Left:=Kiri: -Right:=Kanan: -Bottom:=Bawah: -Header/Footer=Kepala/Kaki -Print Header=Kepala/Header Halaman Cetak -Header Text:=Teks Kepala/Header: -Print Footer= Kaki/Footer Halaman Cetak -Footer Text:=Teks Kaki/Footer: -Formatting Options=Pilihan Format -Font and Size=Font dan Ukuran -Chapter Heading:=Judul Bab/Pasal: -Body Text:=Teks Utama: -Verse Numbers:=Nomor Ayat: -Font:=Font: -Book Name=Nama Kitab/Buku -Chapter Headings=Judul Bab/Pasal -Paragraph Format=Format Paragraf -Verse Numbers=Nomor Ayat -Superscripted=Tulisan Superskrip -Prefixed (John 1:1 KJV)...=Alamat Ayat Sebelum (Yohanes 1:1 TB)... -Postfixed ...(John 1:1 KJV)=Alamat Ayat Setelah ...(Yohanes 1:1 TB) -"English (US)","Czech","Danish","German","French","Norwegian","Polish","Portuguese","Slovak"="Inggris","Cekoslovakia","Denmark","Jerman","Prancis","Norwegia","Polandia","Portugis","Slovia" -Glossaries=Daftar Kata - Glossary -Show Glossaries as Dictionaries=Tampil Daftar Kata/Glossary Seperti Kamus -Default=Standar/Default -"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules","Pop-Up Windows","Search Results"="Semua Modul","Modul Alkitab","Modul Tafsiran/Komentar","Modul Leksikon/Kamus","Pop-Up Windows","Search Results" -&Save Scheme=Simpan Skema -&Delete Scheme=Hapus Skema -&Import Scheme=Impor Skema -&Export Scheme=Ekspor Skema -Words To Live By...=Kata-kata untuk Kehidupan... -Go Back To Previous Location=Kembali ke Lokasi Sebelumnya -Bring Up Search Window=Dapat Jendala Pencarian -Biblical Texts=Teks Alkitabiah -Commentaries=Tafsiran/Komentar -Lexicons / Dictionaries= Leksikon / Kamus -Lookup Entry=Lookup Entry -Verse Range or List=Verse Range or List -Page Setup=Page Setup -Strong's Numbers <...>=Strong's Numbers <...> -Strong's Tense (...)=Strong's Tense (...) \ No newline at end of file +[Meta] +Name=id +Description=Indonesia +Translator=SABDA/YLSA + +[Text] +#BackBtnImage=uilocales.d/id_back.bmp +#SearchBtnImage=uilocales.d/id_search.bmp +"All Windows","Bible Window","Commentary Window","Lexicon/Dictionary Window","Pop-Up Windows","Search Results"="Seluruh Jendela","Jendela Alkitab","Jendela Tafsir","Leksikon/Kamus","Jendela Pop-up","Hasil Pencarian" +"Entire Module","Current Results","Custom Range"="Seluruh Modul","Hasil Saat Ini","Batasan Khusus" +"Multi Word","Phrase","Regular Expression"="Multi-Kata","Frasa","Ekspresi/Rumus" +&About=&Tentang SWORD/PEDANG... +About The SWORD Project=Tentang Proyek SWORD/PEDANG +&Add=&Tambah +&Add Bookmark=Tambah Bookmark +Add New Bookmark File=Tambah File Bookmark Baru +Bookmark Section Title:=Judul Bagian Bookmark: +Bookmark=Bookmark +Bookmarks=Bookmark +Cancel=Batal +Case Sensitive=Case Sensitive +Chapter=Pasal +Check Modules To Show As Tabs=Cek Modul yang Ditampilkan dalam Tab +Combo/Edit Fields=Field Multi/Edit +Contents=Isi +&Copy=Copy +Copy as &B-Greek Transliteration=Copy Ke Transliterasi Yunani +&Close=Tutup +Create a New Verse List Window=Membuat Jendela Daftar Ayat Baru +Create Verse List=Membuat Daftar Ayat +Create Verse&List From Result=Membuat Daftar Ayat dari Hasil +Current Verse Color=Warna Ayat Aktif +Daily Devotionals=Renungan Harian +Default Devotional=Renungan Standar +Define Custom Range=Definisikan Batasan Khusus +Definitions=Definisi +&Delete Entry=Hapus Data +Description=Deskripsi +Devotion for Today=Renungan untuk Hari Ini +Devotional of the Day=Renungan Hari Ini +Dictionary Lookup=Cari dalam Kamus +Display Colors=Warna Tampilan +Display=Tampilkan +&Edit=&Edit +&Edit Bookmarks / Tree View...=Edit Bookmark / Sub-Bagian... +Edit Entry=Edit Tulisan/Data +&Edit Entry=Edit Tulisan/Data +"Entire Module","Current Results","Custom Range"="Dalam Satu Modul","Dalam Hasil Pencarian","Dalam Batasan Khusus" +E&xit=Keluar +eg. mat-jo;rev4=mis. mat-yoh;wah4 +&File=File +File Name (without extension):=Nama File (tanpa ekstensi): +Font Size:=Ukuran Font: +Found New Module...=Modul Baru Ditemukan... +General=Umum +Default General Dictionary=Kamus Umum Default +Default Devotional=Renungan Default +Glossaries / General Dictionaries=Glossary/Kamus Umum +Greek=Yunani +Hebrew=Ibrani +&Help=Bantuan +Hide / Show Modules=Sembunyikan/Tampilkan Modul +Individual Modules (Font Only)=Modul Tersendiri (Hanya Font) +Install Manager=Program Install Manager +Language=Bahasa +Link to Comment for Verse...=Link Ke Catatan/Komentar untuk Ayat... +Maintain Custom Ranges=Mengolah Batasan Khusus +Window Type=Jenis Jendela +Module Type=Jenis Modul +Module=Modul +"Mult Word","Phrase","Regular Expression"="Multi-Kata","Frasa","Ekspresi/Rumus" +&New Search Window=Jendela Pencarian Baru +&New Verse List=Daftar Ayat Baru +OK=OK +OkBtn=OkBtn +Options=Pilihan +Original Language Support - Default Modules=Dukungan untuk Bahasa Asli - Modul Standar/Default +Parsing=Parsing (Uraian Tata Bahasa) +Personalize=Kustom Pribadi +Preferences=Preferensi +&Preferences...=Preferensi... +Preview=Lihat Dahulu +Preview...=Lihat Dahulu... +Range Name=Batasan Nama +Range Text=Batasan Teks +Reference=Referensi +&Remove=Hapus +&Save=Simpan +S&ave Layout=Simpan Susunan/Layout +Autosave Other Bookmarks=Simpan Otomatis Bookmark Lain +Autosave Personal Bookmarks=Simpan Otomatis Bookmark Pribadi +Autosave Screen Layout=Simpan Otomatis Susunan/Layout Layar +Scheme=Skema +Scope=Ruang Lingkup +&Search=Cari +Search Options=Pilihan Pencarian +Search Type=Jenis Pencarian +Search...=Cari... +Search=Cari +Select Color...=Pilih Warna... +Select Font...=Pilih Font... +Show Devotional at Startup=Renungan di Start-up +Show Devotional Splash Screen on Startup=Tampilkan Layar Renungan Saat Start-up +Show Devotionals as Dictionaries=Tampilkan Renungan Seperti Kamus +Show Glossary Lookup Over Words (CTRL-W)=Tampilkan Lookup Glossary Atas Kata (CTRL-W) +Show Hint Over Strongs Numbers=Tampilkan Tip Nomor Strong +Show Hint Pop-ups=Tampilkan Tip Pop-up +Show Lexicon Lookup Over Strongs Numbers=Tampilkan Lookup Leksikon Atas Nomor Strong +Show Preview Over Verse Lists=Tampilkan Preview Atas Daftar Ayat +Special Modules=Modul Khusus +Strong's Numbered Text=Teks dengan Nomor Strong +Text Styles and Colors=Font Teks +&Tools=Alat-alat +Type Verse=Ketik Ayat +User Verse List=Daftar Ayat Pengguna +Verse List=Daftar Ayat +Verse Number Color=Warna Nomor Ayat +&New Bookmark File=File Bookmark Baru +P&rint...=Cetak... +The SWORD Project=Proyek SWORD/PEDANG +&Footnotes=Catatan Kaki +&On=Hidup/On +O&ff=Mati/Off +&Hebrew Cantillation=Kantilasi/Kanonis Ibrani +H&ebrew Vowel Points=Titik/Poin Vokal Ibrani +&Strong's Numbers=Nomor &Strong +&Morphological Tags= Tag Morfologi +He&adings=Bagian Kepala +&Transliteration=&Transliterasi +&Latin=Bahasa Latin +&Basic Latin=Latin Dasar +B&eta=Beta +B&Greek=Yunani +Print Selection=Pilihan Cetak +Print Source=Sumber Cetak +Bible Text=Teks Alkitab +Commentary Text=Teks Tafsiran +Lexicon/Dictionary Text=Teks Leksikon/Kamus +Module Name=Nama Modul +Print Range=Batasan Cetak +Verse Range or List=Batasan Ayat atau Daftar +&Print=Cetak +&Print...=Cetak... +Print=Cetak +Print...=Cetak... +P&review=Preview +P&review...=Preview... +Printer&s...=Printer... +Margins (Inches)=Margin (Inci) +Top:=Atas: +Left:=Kiri: +Right:=Kanan: +Bottom:=Bawah: +Header/Footer=Header/Footer +Print Header=Header Halaman Cetak +Header Text:=Teks Kepala/Header: +Print Footer= Footer Halaman Cetak +Footer Text:=Teks Kaki/Footer: +Formatting Options=Pilihan Format +Font and Size=Font dan Ukuran +Chapter Heading=Judul Pasal: +Body Text:=Teks Utama/Ayat: +Verse Numbers:=Nomor Ayat: +Font:=Font: +Book Name=Kitab/Buku +Chapter Headings=Judul Pasal +Paragraph Format=Format Paragraf +Verse Numbers=Nomor Ayat +Superscripted=Superskrip +Prefixed (John 1:1 KJV)...=Sebelum (Yoh. 1:1 TB)... Ayat +Postfixed ...(John 1:1 KJV)=Setelah Ayat ...(Yoh. 1:1 TB) +"English (US)","Czech","Danish","German","French","Norwegian","Polish","Portuguese","Slovak"="Inggris","Cekoslovakia","Denmark","Jerman","Prancis","Norwegia","Polandia","Portugis","Slovia" +Glossaries=Daftar Kata - Glossary +Show Glossaries as Dictionaries=Tampil Daftar Kata/Glossary Seperti Kamus +Default=Standar/Default +"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules","Pop-Up Windows","Search Results"="Semua Modul","Modul Alkitab","Modul Tafsiran/Komentar","Modul Leksikon/Kamus","Jendela Pop-Up","Hasil Pencarian" +&Save Scheme=&Simpan Skema +&Delete Scheme=&Hapus Skema +&Import Scheme...=&Impor Skema... +&Export Scheme...=&Ekspor Skema... +Words To Live By...=Kata-kata untuk Kehidupan... +Go Back To Previous Location=Kembali ke Lokasi Sebelumnya +Bring Up Search Window=Dapat Jendala Pencarian +Biblical Texts=Teks Alkitabiah +Commentaries=Tafsiran +Lexicons / Dictionaries= Leksikon / Kamus +Lookup Entry=Masukan Lookup +Page Setup=Page Setup +Strong's Numbers <...>=Nomor Strong <...> +Strong's Tense (...)="Tense" Strong (...) \ No newline at end of file diff --git a/examples/Makefile.in b/examples/Makefile.in index 30f5d0a..3b7d131 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff --git a/examples/cmdline/Makefile.in b/examples/cmdline/Makefile.in index fc0371e..fa6c6f9 100644 --- a/examples/cmdline/Makefile.in +++ b/examples/cmdline/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff --git a/icu/Makefile.in b/icu/Makefile.in index 68520df..abf80f9 100644 --- a/icu/Makefile.in +++ b/icu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff --git a/include/utf8transliterator.h b/include/utf8transliterator.h index 8e5175b..76d43b1 100644 --- a/include/utf8transliterator.h +++ b/include/utf8transliterator.h @@ -26,17 +26,19 @@ enum scriptEnum {SE_OFF, SE_LATIN, /*one-way (to) transliterators*/ SE_BASICLATI #include #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include -#include -#include +//#include +//#include #include #include +class UnicodeString; + struct SWTransData { UnicodeString resource; UTransDirection dir; diff --git a/lib/Makefile.in b/lib/Makefile.in index a205e31..ff10833 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -113,7 +113,7 @@ globalconfdir := @sysconfdir@ lib_LTLIBRARIES = libsword.la -libsword_la_SOURCES = $(keysdir)/swkey.cpp $(keysdir)/listkey.cpp $(keysdir)/versekey.cpp $(keysdir)/strkey.cpp $(keysdir)/treekey.cpp $(keysdir)/treekeyidx.cpp $(utilfunsdir)/Greek2Greek.cpp $(utilfunsdir)/utilstr.cpp $(utilfunsdir)/unixstr.cpp $(utilfunsdir)/swunicod.cpp $(utilfunsdir)/swversion.cpp $(SWREGEX) $(utilfunsdir)/roman.c $(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp $(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp $(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp $(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp $(mgrdir)/swcacher.cpp $(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp $(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp $(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp $(commondir)/lzsscomprs.cpp $(SWZLIB) $(commondir)/rawverse.cpp $(commondir)/swcipher.cpp $(commondir)/zverse.cpp $(commondir)/zstr.cpp $(commondir)/entriesblk.cpp $(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp $(filtersdir)/gbfhtml.cpp $(filtersdir)/gbfhtmlhref.cpp $(filtersdir)/gbfplain.cpp $(filtersdir)/gbfrtf.cpp $(filtersdir)/plainhtml.cpp $(filtersdir)/rwphtml.cpp $(filtersdir)/rwprtf.cpp $(filtersdir)/cipherfil.cpp $(filtersdir)/rtfhtml.cpp $(filtersdir)/gbfstrongs.cpp $(filtersdir)/gbffootnotes.cpp $(filtersdir)/gbfheadings.cpp $(filtersdir)/gbfmorph.cpp $(filtersdir)/plainfootnotes.cpp $(filtersdir)/thmlstrongs.cpp $(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp $(filtersdir)/thmlmorph.cpp $(filtersdir)/thmllemma.cpp $(filtersdir)/thmlscripref.cpp $(filtersdir)/thmlvariants.cpp $(filtersdir)/gbfthml.cpp $(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp $(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp $(filtersdir)/thmlosis.cpp $(filtersdir)/gbfosis.cpp $(filtersdir)/thmlplain.cpp $(filtersdir)/unicodertf.cpp $(filtersdir)/latin1utf8.cpp $(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp $(filtersdir)/utf16utf8.cpp $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8html.cpp $(filtersdir)/utf8latin1.cpp $(filtersdir)/thmlolb.cpp $(filtersdir)/greeklexattribs.cpp $(SWICUSRC) $(filtersdir)/utf8cantillation.cpp $(filtersdir)/utf8hebrewpoints.cpp $(filtersdir)/utf8greekaccents.cpp $(genbookdir)/swgenbook.cpp $(rawgenbookdir)/rawgenbook.cpp $(textsdir)/swtext.cpp $(rawtextdir)/rawtext.cpp $(ztextdir)/ztext.cpp $(rawgbfdir)/rawgbf.cpp $(commentsdir)/swcom.cpp $(rawcomdir)/rawcom.cpp $(rawfilesdir)/rawfiles.cpp $(zcomdir)/zcom.cpp $(hrefcomdir)/hrefcom.cpp $(lexdictdir)/swld.cpp $(rawlddir)/rawld.cpp $(rawld4dir)/rawld4.cpp $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp +libsword_la_SOURCES = $(keysdir)/swkey.cpp $(keysdir)/listkey.cpp $(keysdir)/versekey.cpp $(keysdir)/strkey.cpp $(keysdir)/treekey.cpp $(keysdir)/treekeyidx.cpp $(utilfunsdir)/Greek2Greek.cpp $(utilfunsdir)/utilstr.cpp $(utilfunsdir)/unixstr.cpp $(utilfunsdir)/swunicod.cpp $(utilfunsdir)/swversion.cpp $(SWREGEX) $(utilfunsdir)/roman.cpp $(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp $(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp $(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp $(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp $(mgrdir)/swcacher.cpp $(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp $(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp $(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp $(commondir)/lzsscomprs.cpp $(SWZLIB) $(commondir)/rawverse.cpp $(commondir)/swcipher.cpp $(commondir)/zverse.cpp $(commondir)/zstr.cpp $(commondir)/entriesblk.cpp $(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp $(filtersdir)/gbfhtml.cpp $(filtersdir)/gbfhtmlhref.cpp $(filtersdir)/gbfplain.cpp $(filtersdir)/gbfrtf.cpp $(filtersdir)/plainhtml.cpp $(filtersdir)/rwphtml.cpp $(filtersdir)/rwprtf.cpp $(filtersdir)/cipherfil.cpp $(filtersdir)/rtfhtml.cpp $(filtersdir)/gbfstrongs.cpp $(filtersdir)/gbffootnotes.cpp $(filtersdir)/gbfheadings.cpp $(filtersdir)/gbfmorph.cpp $(filtersdir)/plainfootnotes.cpp $(filtersdir)/thmlstrongs.cpp $(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp $(filtersdir)/thmlmorph.cpp $(filtersdir)/thmllemma.cpp $(filtersdir)/thmlscripref.cpp $(filtersdir)/thmlvariants.cpp $(filtersdir)/gbfthml.cpp $(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp $(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp $(filtersdir)/thmlosis.cpp $(filtersdir)/gbfosis.cpp $(filtersdir)/thmlplain.cpp $(filtersdir)/unicodertf.cpp $(filtersdir)/latin1utf8.cpp $(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp $(filtersdir)/utf16utf8.cpp $(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8html.cpp $(filtersdir)/utf8latin1.cpp $(filtersdir)/thmlolb.cpp $(filtersdir)/greeklexattribs.cpp $(SWICUSRC) $(filtersdir)/utf8cantillation.cpp $(filtersdir)/utf8hebrewpoints.cpp $(filtersdir)/utf8greekaccents.cpp $(genbookdir)/swgenbook.cpp $(rawgenbookdir)/rawgenbook.cpp $(textsdir)/swtext.cpp $(rawtextdir)/rawtext.cpp $(ztextdir)/ztext.cpp $(rawgbfdir)/rawgbf.cpp $(commentsdir)/swcom.cpp $(rawcomdir)/rawcom.cpp $(rawfilesdir)/rawfiles.cpp $(zcomdir)/zcom.cpp $(hrefcomdir)/hrefcom.cpp $(lexdictdir)/swld.cpp $(rawlddir)/rawld.cpp $(rawld4dir)/rawld4.cpp $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp @ICU_TRUE@libsword_la_LIBADD = -licui18n -licuuc -lustdio @ICU_FALSE@libsword_la_LIBADD = libsword_la_LDFLAGS = -version-info 1 @@ -352,7 +352,7 @@ unixstr.lo: $(utilfunsdir)/unixstr.cpp swunicod.lo: $(utilfunsdir)/swunicod.cpp swversion.lo: $(utilfunsdir)/swversion.cpp regex.lo: $(utilfunsdir)/regex.c -roman.lo: $(utilfunsdir)/roman.c +roman.lo: $(utilfunsdir)/roman.cpp swconfig.lo: $(mgrdir)/swconfig.cpp swmgr.lo: $(mgrdir)/swmgr.cpp swfiltermgr.lo: $(mgrdir)/swfiltermgr.cpp @@ -588,24 +588,6 @@ regex.lo: $(utilfunsdir)/regex.c @AMDEP_TRUE@ depfile='$(DEPDIR)/regex.Plo' tmpdepfile='$(DEPDIR)/regex.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regex.lo `test -f '$(utilfunsdir)/regex.c' || echo '$(srcdir)/'`$(utilfunsdir)/regex.c - -roman.o: $(utilfunsdir)/roman.c -@AMDEP_TRUE@ source='$(utilfunsdir)/roman.c' object='roman.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/roman.Po' tmpdepfile='$(DEPDIR)/roman.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o roman.o `test -f '$(utilfunsdir)/roman.c' || echo '$(srcdir)/'`$(utilfunsdir)/roman.c - -roman.obj: $(utilfunsdir)/roman.c -@AMDEP_TRUE@ source='$(utilfunsdir)/roman.c' object='roman.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/roman.Po' tmpdepfile='$(DEPDIR)/roman.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o roman.obj `cygpath -w $(utilfunsdir)/roman.c` - -roman.lo: $(utilfunsdir)/roman.c -@AMDEP_TRUE@ source='$(utilfunsdir)/roman.c' object='roman.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/roman.Plo' tmpdepfile='$(DEPDIR)/roman.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o roman.lo `test -f '$(utilfunsdir)/roman.c' || echo '$(srcdir)/'`$(utilfunsdir)/roman.c CCDEPMODE = @CCDEPMODE@ .cpp.o: @@ -824,6 +806,24 @@ swversion.lo: $(utilfunsdir)/swversion.cpp @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swversion.lo `test -f '$(utilfunsdir)/swversion.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swversion.cpp +roman.o: $(utilfunsdir)/roman.cpp +@AMDEP_TRUE@ source='$(utilfunsdir)/roman.cpp' object='roman.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/roman.Po' tmpdepfile='$(DEPDIR)/roman.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roman.o `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp + +roman.obj: $(utilfunsdir)/roman.cpp +@AMDEP_TRUE@ source='$(utilfunsdir)/roman.cpp' object='roman.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/roman.Po' tmpdepfile='$(DEPDIR)/roman.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roman.obj `cygpath -w $(utilfunsdir)/roman.cpp` + +roman.lo: $(utilfunsdir)/roman.cpp +@AMDEP_TRUE@ source='$(utilfunsdir)/roman.cpp' object='roman.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/roman.Plo' tmpdepfile='$(DEPDIR)/roman.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roman.lo `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp + swconfig.o: $(mgrdir)/swconfig.cpp @AMDEP_TRUE@ source='$(mgrdir)/swconfig.cpp' object='swconfig.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/swconfig.Po' tmpdepfile='$(DEPDIR)/swconfig.TPo' @AMDEPBACKSLASH@ diff --git a/locales.d/id.conf b/locales.d/id.conf index f0021ec..8e12c8a 100644 --- a/locales.d/id.conf +++ b/locales.d/id.conf @@ -1,455 +1,463 @@ -[Meta] -Name=id -Description=Indonesian - -[Text] -Genesis=Kejadian -Exodus=Keluaran -Leviticus=Imamat -Numbers=Bilangan -Deuteronomy=Ulangan -Joshua=Yosua -Judges=Hakim-hakim -Ruth=Rut -I Samuel=1 Samuel -II Samuel=2 Samuel -I Kings=1 Raja-raja -II Kings=2 Raja-raja -I Chronicles=1 Tawarikh -II Chronicles=2 Tawarikh -Ezra=Ezra -Nehemiah=Nehemia -Esther=Ester -Job=Ayub -Psalms=Mazmur -Proverbs=Amsal -Ecclesiastes=Pengkhotbah -Song of Solomon=Kidung Agung -Isaiah=Yesaya -Jeremiah=Yeremia -Lamentations=Ratapan -Ezekiel=Yehezkiel -Daniel=Daniel -Hosea=Hosea -Joel=Yoel -Amos=Amos -Obadiah=Obaja -Jonah=Yunus -Micah=Mikha -Nahum=Nahum -Habakkuk=Habakuk -Zephaniah=Zefanya -Haggai=Hagai -Zechariah=Zakharia -Malachi=Maleakhi -Matthew=Matius -Mark=Markus -Luke=Lukas -John=Yohanes -Acts=Kisah Para Rasul -Romans=Roma -I Corinthians=1 Korintus -II Corinthians=2 Korintus -Galatians=Galatia -Ephesians=Efesus -Philippians=Filipi -Colossians=Kolose -I Thessalonians=1 Tesalonika -II Thessalonians=2 Tesalonika -I Timothy=1 Timotius -II Timothy=2 Timotius -Titus=Titus -Philemon=Filemon -Hebrews=Ibrani -James=Yakobus -I Peter=1 Petrus -II Peter=2 Petrus -I John=1 Yohanes -II John=2 Yohanes -III John=3 Yohanes -Jude=Yudas -Revelation of John=Wahyu - -[Book Abbrevs] -1 C=46 -1 CHRONICLES=13 -1 CORINTHIANS=46 -1 JN=62 -1 JOHN=62 -1 KGS=11 -1 KINGS=11 -1 KOR=46 -1 KORINTUS=46 -1 PE=60 -1 PETER=60 -1 PETRUS=60 -1 PTR=60 -1 RA=11 -1 RAJA-RAJA=11 -1 SA=9 -1 SAMUEL=9 -1 TA=13 -1 TAWARIKH=13 -1 TE=52 -1 TESALONIKA=52 -1 THESSALONIANS=52 -1 TI=54 -1 TIMOTHY=54 -1 TIMOTIUS=54 -1 YO=62 -1 YOHANES=62 -1C=46 -1CHRONICLES=13 -1CORINTHIANS=46 -1JN=62 -1JOHN=62 -1KGS=11 -1KINGS=11 -1KO=46 -1PE=60 -1PETER=60 -1PTR=60 -1RA=11 -1SA=9 -1SAMUEL=9 -1TA=13 -1TE=52 -1THESSALONIANS=52 -1TI=54 -1TIMOTHY=54 -1YO=62 -1YOH=62 -2 C=47 -2 CHRONICLES=14 -2 CORINTHIANS=47 -2 JN=63 -2 JOHN=63 -2 KGS=12 -2 KINGS=12 -2 KO=47 -2 KORINTUS=47 -2 PE=61 -2 PETER=61 -2 PETRUS=61 -2 PTR=61 -2 RA=12 -2 RAJA-RAJA=12 -2 SA=10 -2 SAMUEL=10 -2 TA=14 -2 TAWARIKH=14 -2 TE=53 -2 TESALONIKA=53 -2 THESSALONIANS=53 -2 TI=55 -2 TIMOTHY=55 -2 TIMOTIUS=55 -2 YO=63 -2 YOHANES=63 -2C=47 -2CHRONICLES=14 -2CORINTHIANS=47 -2JN=63 -2JOHN=63 -2KGS=12 -2KINGS=12 -2KO=47 -2PE=61 -2PETER=61 -2PTR=61 -2RA=12 -2SA=10 -2SAMUEL=10 -2TA=14 -2TE=53 -2THESSALONIANS=53 -2TI=55 -2TIMOTHY=55 -2YO=63 -2YOH=63 -3 JN=64 -3 JOHN=64 -3 YO=64 -3 YOHANES=64 -3JN=64 -3JOHN=64 -3YO=64 -3YOH=64 -A=20 -ACTS=44 -AM=30 -AMO=30 -AMOS=30 -AMS=20 -AMSAL=20 -AYB=18 -AYU=18 -AYUB=18 -BIL=4 -BILANGAN=4 -C=51 -CANTICLE OF CANTICLES=22 -COC=22 -COLOSSIANS=51 -D=27 -DAN=27 -DANIEL=27 -DEUTERONOMY=5 -E=49 -ECCLESIASTES=21 -EF=49 -EFESUS=49 -EPHESIANS=49 -EST=17 -ESTER=17 -ESTHER=17 -EXODUS=2 -EZEKIEL=26 -EZR=15 -EZRA=15 -F=50 -FILE=57 -FILEMON=57 -FILI=50 -FILIPI=50 -FLM=57 -FLP=50 -G=48 -GAL=48 -GALATIA=48 -GALATIANS=48 -GENESIS=1 -H=7 -HA=7 -HAB=35 -HABAKKUK=35 -HABAKUK=35 -HAG=37 -HAGAI=37 -HAGGAI=37 -HAK=7 -HAKIM-HAKIM=7 -HE=58 -HEBREWS=58 -HOS=28 -HOSEA=28 -I C=46 -I CHRONICLES=13 -I CORINTHIANS=46 -I JN=62 -I JOHN=62 -I KGS=11 -I KINGS=11 -I KO=46 -I PE=60 -I PETER=60 -I PETRUS=60 -I PTR=60 -I RA=11 -I SA=9 -I SAMUEL=9 -I TA=13 -I TE=52 -I THESSALONIANS=52 -I TI=54 -I TIMOTHY=54 -I YO=62 -I=3 -IBR=58 -IBRANI=58 -IC=46 -ICHRONICLES=13 -ICORINTHIANS=46 -II C=47 -II CHRONICLES=14 -II CORINTHIANS=47 -II JN=63 -II JOHN=63 -II KGS=12 -II KINGS=12 -II KO=47 -II PE=61 -II PETER=61 -II PETRUS=61 -II PTR=61 -II RA=12 -II SA=10 -II SAMUEL=10 -II TA=14 -II TE=53 -II THESSALONIANS=53 -II TI=55 -II TIMOTHY=55 -II YO=63 -IIC=47 -IICHRONICLES=14 -IICORINTHIANS=47 -III JN=64 -III JOHN=64 -III YO=64 -IIIJN=64 -IIIJOHN=64 -IIIYO=64 -IIJN=63 -IIJOHN=63 -IIKGS=12 -IIKINGS=12 -IIKO=47 -IIPE=61 -IIPETER=61 -IIPETRUS=61 -IIPTR=61 -IIRA=12 -IISA=10 -IISAMUEL=10 -IITA=14 -IITE=53 -IITHESSALONIANS=53 -IITI=54 -IITI=55 -IITIMOTHY=55 -IIYO=63 -IJN=62 -IJOHN=62 -IKGS=11 -IKINGS=11 -IKO=46 -IM=3 -IMAMAT=3 -IPE=60 -IPETER=60 -IPETRUS=60 -IPTR=60 -IRA=11 -ISA=23 -ISAIAH=23 -ISAMUEL=9 -ITA=13 -ITE=52 -ITHESSALONIANS=52 -ITIMOTHY=54 -IYES=23 -IYO=62 -J=43 -JAMES=59 -JAS=59 -JEREMIAH=24 -JN=43 -JO=43 -JOB=18 -JOEL=29 -JOHN=43 -JONAH=32 -JOSHUA=6 -JUD=7 -JUDE=65 -JUDGES=7 -KEJ=1 -KEJADIAN=1 -KEL=2 -KELUARAN=2 -KID=22 -KIDUNG AGUNG=22 -KIS=44 -KISAH PARA RASUL=44 -KOL=51 -KOLOSE=51 -L=42 -LAMENTATIONS=25 -LEVITICUS=3 -LK=42 -LUK=42 -LUKAS=42 -LUKE=42 -MA=40 -MAL=39 -MALACHI=39 -MALEAKHI=39 -MARK=41 -MARKUS=41 -MAT=40 -MATIUS=40 -MATTHEW=40 -MAZ=19 -MAZMUR=19 -MICAH=33 -MIK=33 -MIKHA=33 -MK=41 -MR=41 -MRK=41 -MT=40 -MZM=19 -N=16 -NAH=34 -NAHUM=34 -NEH=16 -NEHEMIA=16 -NEHEMIAH=16 -NUMBERS=4 -OB=31 -OBADIAH=31 -OBAJA=31 -P=21 -PENGK=21 -PENGKHOTBAH=21 -PH=50 -PHILEMON=57 -PHILIPPIANS=50 -PHM=57 -PHP=50 -PKH=21 -PROVERBS=20 -PSALMS=19 -PSM=19 -PSS=19 -R=45 -RAT=25 -RATAPAN=25 -REVELATION OF JOHN=66 -REVELATION OF ST. JOHN=66 -REVELATION=66 -RM=45 -ROM=45 -ROMA=45 -ROMANS=45 -RUT=8 -RUTH=8 -SONG OF SOLOMON=22 -SONG OF SONGS=22 -SOS=22 -TIT=56 -TITUS=56 -UL=5 -ULANGAN=5 -WAH=66 -WAHYU=66 -WHY=66 -Y=43 -YAK=59 -YAKOBUS=59 -YE=23 -YEH=26 -YEHEZKIEL=26 -YER=24 -YEREMIA=24 -YES=23 -YESAYA=23 -YL=29 -YO=43 -YOE=29 -YOEL=29 -YOH=43 -YOHANES=43 -YOS=6 -YOSUA=6 -YUD=65 -YUDAS=65 -YUN=32 -YUNUS=32 -ZAK=38 -ZAKHARIA=38 -ZECHARIAH=38 -ZEF=36 -ZEFANYA=36 -ZEPHANIAH=36 +[Meta] +Name=id +Description=Indonesian + +[Text] +Genesis=Kejadian +Exodus=Keluaran +Leviticus=Imamat +Numbers=Bilangan +Deuteronomy=Ulangan +Joshua=Yosua +Judges=Hakim-hakim +Ruth=Rut +I Samuel=1 Samuel +II Samuel=2 Samuel +I Kings=1 Raja +II Kings=2 Raja +I Chronicles=1 Tawarikh +II Chronicles=2 Tawarikh +Ezra=Ezra +Nehemiah=Nehemia +Esther=Ester +Job=Ayub +Psalms=Mazmur +Proverbs=Amsal +Ecclesiastes=Pengkhotbah +Song of Solomon=Kidung Agung +Isaiah=Yesaya +Jeremiah=Yeremia +Lamentations=Ratapan +Ezekiel=Yehezkiel +Daniel=Daniel +Hosea=Hosea +Joel=Yoel +Amos=Amos +Obadiah=Obaja +Jonah=Yunus +Micah=Mikha +Nahum=Nahum +Habakkuk=Habakuk +Zephaniah=Zefanya +Haggai=Hagai +Zechariah=Zakharia +Malachi=Maleakhi +Matthew=Matius +Mark=Markus +Luke=Lukas +John=Yohanes +Acts=Kisah Para Rasul +Romans=Roma +I Corinthians=1 Korintus +II Corinthians=2 Korintus +Galatians=Galatia +Ephesians=Efesus +Philippians=Filipi +Colossians=Kolose +I Thessalonians=1 Tesalonika +II Thessalonians=2 Tesalonika +I Timothy=1 Timotius +II Timothy=2 Timotius +Titus=Titus +Philemon=Filemon +Hebrews=Ibrani +James=Yakobus +I Peter=1 Petrus +II Peter=2 Petrus +I John=1 Yohanes +II John=2 Yohanes +III John=3 Yohanes +Jude=Yudas +Revelation of John=Wahyu + +[Book Abbrevs] +1 C=46 +1 CHRONICLES=13 +1 CORINTHIANS=46 +1 JN=62 +1 JOHN=62 +1 KGS=11 +1 KINGS=11 +1 KOR=46 +1 KORINTUS=46 +1 PE=60 +1 PETER=60 +1 PETRUS=60 +1 PTR=60 +1 RA=11 +1 RAJA=11 +1 RAJA-RAJA=11 +1 SA=9 +1 SAMUEL=9 +1 TA=13 +1 TAWARIKH=13 +1 TE=52 +1 TESALONIKA=52 +1 THESSALONIANS=52 +1 TI=54 +1 TIMOTHY=54 +1 TIMOTIUS=54 +1 YO=62 +1 YOHANES=62 +1C=46 +1CHRONICLES=13 +1CORINTHIANS=46 +1JN=62 +1JOHN=62 +1KGS=11 +1KINGS=11 +1KO=46 +1PE=60 +1PETER=60 +1PTR=60 +1RA=11 +1RAJA-RAJA=11 +1SA=9 +1SAMUEL=9 +1TA=13 +1TE=52 +1THESSALONIANS=52 +1TI=54 +1TIMOTHY=54 +1YO=62 +1YOH=62 +2 C=47 +2 CHRONICLES=14 +2 CORINTHIANS=47 +2 JN=63 +2 JOHN=63 +2 KGS=12 +2 KINGS=12 +2 KO=47 +2 KORINTUS=47 +2 PE=61 +2 PETER=61 +2 PETRUS=61 +2 PTR=61 +2 RA=12 +2 RAJA=12 +2 RAJA-RAJA=12 +2 SA=10 +2 SAMUEL=10 +2 TA=14 +2 TAWARIKH=14 +2 TE=53 +2 TESALONIKA=53 +2 THESSALONIANS=53 +2 TI=55 +2 TIMOTHY=55 +2 TIMOTIUS=55 +2 YO=63 +2 YOHANES=63 +2C=47 +2CHRONICLES=14 +2CORINTHIANS=47 +2JN=63 +2JOHN=63 +2KGS=12 +2KINGS=12 +2KO=47 +2PE=61 +2PETER=61 +2PTR=61 +2RA=12 +2RAJA-RAJA=12 +2SA=10 +2SAMUEL=10 +2TA=14 +2TE=53 +2THESSALONIANS=53 +2TI=55 +2TIMOTHY=55 +2YO=63 +2YOH=63 +3 JN=64 +3 JOHN=64 +3 YO=64 +3 YOHANES=64 +3JN=64 +3JOHN=64 +3YO=64 +3YOH=64 +A=20 +ACTS=44 +AM=30 +AMO=30 +AMOS=30 +AMS=20 +AMSAL=20 +AYB=18 +AYU=18 +AYUB=18 +BIL=4 +BILANGAN=4 +C=51 +CANTICLE OF CANTICLES=22 +COC=22 +COLOSSIANS=51 +D=27 +DAN=27 +DANIEL=27 +DEUTERONOMY=5 +E=49 +ECCLESIASTES=21 +EF=49 +EFESUS=49 +EPHESIANS=49 +EST=17 +ESTER=17 +ESTHER=17 +EXODUS=2 +EZEKIEL=26 +EZR=15 +EZRA=15 +F=50 +FILE=57 +FILEMON=57 +FILI=50 +FILIPI=50 +FLM=57 +FLP=50 +G=48 +GAL=48 +GALATIA=48 +GALATIANS=48 +GENESIS=1 +H=7 +HA=7 +HAB=35 +HABAKKUK=35 +HABAKUK=35 +HAG=37 +HAGAI=37 +HAGGAI=37 +HAK=7 +HAKIM-HAKIM=7 +HE=58 +HEBREWS=58 +HOS=28 +HOSEA=28 +I C=46 +I CHRONICLES=13 +I CORINTHIANS=46 +I JN=62 +I JOHN=62 +I KGS=11 +I KINGS=11 +I KO=46 +I PE=60 +I PETER=60 +I PETRUS=60 +I PTR=60 +I RA=11 +I RAJA-RAJA=11 +I SA=9 +I SAMUEL=9 +I TA=13 +I TE=52 +I THESSALONIANS=52 +I TI=54 +I TIMOTHY=54 +I YO=62 +I=3 +IBR=58 +IBRANI=58 +IC=46 +ICHRONICLES=13 +ICORINTHIANS=46 +II C=47 +II CHRONICLES=14 +II CORINTHIANS=47 +II JN=63 +II JOHN=63 +II KGS=12 +II KINGS=12 +II KO=47 +II PE=61 +II PETER=61 +II PETRUS=61 +II PTR=61 +II RA=12 +II RAJA-RAJA=12 +II SA=10 +II SAMUEL=10 +II TA=14 +II TE=53 +II THESSALONIANS=53 +II TI=55 +II TIMOTHY=55 +II YO=63 +IIC=47 +IICHRONICLES=14 +IICORINTHIANS=47 +III JN=64 +III JOHN=64 +III YO=64 +IIIJN=64 +IIIJOHN=64 +IIIYO=64 +IIJN=63 +IIJOHN=63 +IIKGS=12 +IIKINGS=12 +IIKO=47 +IIPE=61 +IIPETER=61 +IIPETRUS=61 +IIPTR=61 +IIRA=12 +IIRAJA-RAJA=12 +IISA=10 +IISAMUEL=10 +IITA=14 +IITE=53 +IITHESSALONIANS=53 +IITI=54 +IITI=55 +IITIMOTHY=55 +IIYO=63 +IJN=62 +IJOHN=62 +IKGS=11 +IKINGS=11 +IKO=46 +IM=3 +IMAMAT=3 +IPE=60 +IPETER=60 +IPETRUS=60 +IPTR=60 +IRA=11 +IRAJA-RAJA=11 +ISA=23 +ISAIAH=23 +ISAMUEL=9 +ITA=13 +ITE=52 +ITHESSALONIANS=52 +ITIMOTHY=54 +IYES=23 +IYO=62 +J=43 +JAMES=59 +JAS=59 +JEREMIAH=24 +JN=43 +JO=43 +JOB=18 +JOEL=29 +JOHN=43 +JONAH=32 +JOSHUA=6 +JUD=7 +JUDE=65 +JUDGES=7 +KEJ=1 +KEJADIAN=1 +KEL=2 +KELUARAN=2 +KID=22 +KIDUNG AGUNG=22 +KIS=44 +KISAH PARA RASUL=44 +KOL=51 +KOLOSE=51 +L=42 +LAMENTATIONS=25 +LEVITICUS=3 +LK=42 +LUK=42 +LUKAS=42 +LUKE=42 +MA=40 +MAL=39 +MALACHI=39 +MALEAKHI=39 +MARK=41 +MARKUS=41 +MAT=40 +MATIUS=40 +MATTHEW=40 +MAZ=19 +MAZMUR=19 +MICAH=33 +MIK=33 +MIKHA=33 +MK=41 +MR=41 +MRK=41 +MT=40 +MZM=19 +N=16 +NAH=34 +NAHUM=34 +NEH=16 +NEHEMIA=16 +NEHEMIAH=16 +NUMBERS=4 +OB=31 +OBADIAH=31 +OBAJA=31 +P=21 +PENGK=21 +PENGKHOTBAH=21 +PH=50 +PHILEMON=57 +PHILIPPIANS=50 +PHM=57 +PHP=50 +PKH=21 +PROVERBS=20 +PSALMS=19 +PSM=19 +PSS=19 +R=45 +RAT=25 +RATAPAN=25 +REVELATION OF JOHN=66 +REVELATION OF ST. JOHN=66 +REVELATION=66 +RM=45 +ROM=45 +ROMA=45 +ROMANS=45 +RUT=8 +RUTH=8 +SONG OF SOLOMON=22 +SONG OF SONGS=22 +SOS=22 +TIT=56 +TITUS=56 +UL=5 +ULANGAN=5 +WAH=66 +WAHYU=66 +WHY=66 +Y=43 +YAK=59 +YAKOBUS=59 +YE=23 +YEH=26 +YEHEZKIEL=26 +YER=24 +YEREMIA=24 +YES=23 +YESAYA=23 +YL=29 +YO=43 +YOE=29 +YOEL=29 +YOH=43 +YOHANES=43 +YOS=6 +YOSUA=6 +YUD=65 +YUDAS=65 +YUN=32 +YUNUS=32 +ZAK=38 +ZAKHARIA=38 +ZECHARIAH=38 +ZEF=36 +ZEFANYA=36 +ZEPHANIAH=36 diff --git a/src/frontend/swlog.cpp b/src/frontend/swlog.cpp index 277a70d..15f26fb 100644 --- a/src/frontend/swlog.cpp +++ b/src/frontend/swlog.cpp @@ -5,6 +5,11 @@ #ifndef _MSC_VER #include #endif +#if defined(_ICU_) && !defined(_ICUSWORD_) +#define _USTDIO_ +#include +#include +#endif #include "swlog.h" //--------------------------------------------------------------------------- @@ -25,12 +30,20 @@ public: void SWLog::LogWarning(char *fmt, ...) { + #ifdef _USTDIO_ + UChar msg[2048]; + #else char msg[2048]; + #endif va_list argptr; if (logLevel >= 2) { va_start(argptr, fmt); + #ifdef _USTDIO_ + u_vsprintf(msg, NULL, fmt, argptr); + #else vsprintf(msg, fmt, argptr); + #endif va_end(argptr); #ifndef _MSC_VER @@ -43,12 +56,20 @@ void SWLog::LogWarning(char *fmt, ...) void SWLog::LogError(char *fmt, ...) { + #ifdef _USTDIO_ + UChar msg[2048]; + #else char msg[2048]; + #endif va_list argptr; if (logLevel) { va_start(argptr, fmt); + #ifdef _USTDIO_ + u_vsprintf(msg, NULL, fmt, argptr); + #else vsprintf(msg, fmt, argptr); + #endif va_end(argptr); #ifndef _MSC_VER @@ -61,12 +82,20 @@ void SWLog::LogError(char *fmt, ...) void SWLog::LogTimedInformation(char *fmt, ...) { + #ifdef _USTDIO_ + UChar msg[2048]; + #else char msg[2048]; + #endif va_list argptr; if (logLevel >= 4) { va_start(argptr, fmt); + #ifdef _USTDIO_ + u_vsprintf(msg, NULL, fmt, argptr); + #else vsprintf(msg, fmt, argptr); + #endif va_end(argptr); #ifndef _MSC_VER @@ -79,12 +108,20 @@ void SWLog::LogTimedInformation(char *fmt, ...) void SWLog::LogInformation(char *fmt, ...) { + #ifdef _USTDIO_ + UChar msg[2048]; + #else char msg[2048]; + #endif va_list argptr; if (logLevel >= 3) { va_start(argptr, fmt); + #ifdef _USTDIO_ + u_vsprintf(msg, NULL, fmt, argptr); + #else vsprintf(msg, fmt, argptr); + #endif va_end(argptr); #ifndef _MSC_VER diff --git a/src/modules/filters/utf8transliterator.cpp b/src/modules/filters/utf8transliterator.cpp index 3686717..ff39865 100644 --- a/src/modules/filters/utf8transliterator.cpp +++ b/src/modules/filters/utf8transliterator.cpp @@ -20,6 +20,7 @@ #endif #include +#if 0 #ifdef _ICU_ class UnicodeCaster { const UnicodeString &ustr; @@ -27,6 +28,7 @@ public: UnicodeCaster(const UnicodeString &ustr):ustr(ustr) {}; operator const char *() { return ""; }; }; +#endif #endif const char UTF8Transliterator::optionstring[NUMTARGETSCRIPTS][16] = { "Off", @@ -160,7 +162,8 @@ void UTF8Transliterator::Load(UErrorCode &status) 0x0046 /*F*/) ? UTRANS_FORWARD : UTRANS_REVERSE; //registry->put(id, resString, dir, visible); - SWLog::systemlog->LogInformation("instantiating %s ...", (const char *)(UnicodeCaster)resString); + //SWLog::systemlog->LogInformation("instantiating %s ...", (const char *)(UnicodeCaster)resString); + SWLog::systemlog->LogInformation("instantiating %s ...", resString.getBuffer()); registerTrans(id, resString, dir, status); SWLog::systemlog->LogInformation("done."); } @@ -194,7 +197,8 @@ void UTF8Transliterator::registerTrans(const UnicodeString& ID, const UnicodeSt UTransDirection dir, UErrorCode &status ) { #ifndef _ICUSWORD_ - SWLog::systemlog->LogInformation("registering ID locally %s", (const char *)(UnicodeCaster)ID); + //SWLog::systemlog->LogInformation("registering ID locally %s", (const char *)(UnicodeCaster)ID); + SWLog::systemlog->LogInformation("registering ID locally %s", ID.getBuffer()); SWTransData swstuff; swstuff.resource = resource; swstuff.dir = dir; @@ -212,7 +216,8 @@ bool UTF8Transliterator::checkTrans(const UnicodeString& ID, UErrorCode &status if (!U_FAILURE(status)) { // already have it, clean up and return true - SWLog::systemlog->LogInformation("already have it %s", (const char *)(UnicodeCaster)ID); + //SWLog::systemlog->LogInformation("already have it %s", (const char *)(UnicodeCaster)ID); + SWLog::systemlog->LogInformation("already have it %s", ID.getBuffer()); delete trans; return true; } @@ -227,7 +232,8 @@ bool UTF8Transliterator::checkTrans(const UnicodeString& ID, UErrorCode &status //UErrorCode status; //std::cout << "unregistering " << ID << std::endl; //Transliterator::unregister(ID); - SWLog::systemlog->LogInformation("resource is %s", (const char *)(UnicodeCaster)swstuff.resource); + //SWLog::systemlog->LogInformation("resource is %s", (const char *)(UnicodeCaster)swstuff.resource); + SWLog::systemlog->LogInformation("resource is %s", swstuff.resource.getBuffer()); // Get the rules //std::cout << "importing: " << ID << ", " << resource << std::endl; diff --git a/src/utilfuns/Makefile.am b/src/utilfuns/Makefile.am index e7b2258..f4ae277 100644 --- a/src/utilfuns/Makefile.am +++ b/src/utilfuns/Makefile.am @@ -14,6 +14,6 @@ endif libsword_la_SOURCES += $(SWREGEX) -libsword_la_SOURCES += $(utilfunsdir)/roman.c +libsword_la_SOURCES += $(utilfunsdir)/roman.cpp diff --git a/tests/Makefile.in b/tests/Makefile.in index 2d056ac..725dac1 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 diff --git a/utilities/Makefile.in b/utilities/Makefile.in index ef013a9..3173233 100644 --- a/utilities/Makefile.in +++ b/utilities/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -- cgit