[sword-svn] r2362 - in trunk: . include locales.d tests utilities utilities/diatheke
scribe at crosswire.org
scribe at crosswire.org
Wed Apr 29 00:21:35 MST 2009
Author: scribe
Date: 2009-04-29 00:21:35 -0700 (Wed, 29 Apr 2009)
New Revision: 2362
Modified:
trunk/include/swcom.h
trunk/locales.d/ar_EG-cp1256.conf
trunk/locales.d/nb-utf8.conf
trunk/locales.d/nb.conf
trunk/tests/icutest.cpp
trunk/usrinst.sh
trunk/utilities/diatheke/diathekemgr.h
trunk/utilities/lexdump.c
Log:
Removed uneeded code which caused problems compiling on other platforms.
Removed CR from a few locales.
Added Windows DLL flags to usrinst.sh
Added docs to SWCom to explain the main difference between it and SWText.
Modified: trunk/include/swcom.h
===================================================================
--- trunk/include/swcom.h 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/include/swcom.h 2009-04-29 07:21:35 UTC (rev 2362)
@@ -1,6 +1,18 @@
/******************************************************************************
* swcom.h - code for base class 'SWCom'. SWCom is the basis for all
- * types of commentary modules
+ * types of commentary modules.
+ * It is traditionally close to the same as the SWText
+ * module type, but has defaults set which more
+ * closely represent how a commentary will be used and how
+ * the bulk of our commentaries expect to be used. For example,
+ * most commentaries consist of entries for a range of text
+ * (Matt.1.1-6: "Matthew begins with by telling us..."). This
+ * same entry will be returned when any verse between Matt.1.1-6
+ * is requested from the engine. This is done with verse linking.
+ * Since linking is used heavily in commentaries, the flag
+ * skipConsecutiveLinks is defaulted to true so when the
+ * commentary is incremented, it will go to the next ENTRY,
+ * not the next verse (likely Matt.1.7, from our example above).
*
* $Id$
*
Modified: trunk/locales.d/ar_EG-cp1256.conf
===================================================================
--- trunk/locales.d/ar_EG-cp1256.conf 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/locales.d/ar_EG-cp1256.conf 2009-04-29 07:21:35 UTC (rev 2362)
@@ -1,209 +1,209 @@
-[Meta]
-Name=ar_EG
-Description=Arabic (EG)
-Encoding=CP1256
-
-[Text]
-Genesis=Êßæíä
-Exodus=ÎÑæÌ
-Leviticus=áÇæííä
-Numbers=ÚÏÏ
-Deuteronomy=ÊËäíÉ
-Joshua=íÔæÚ
-Judges=ÞÖÇå
-Ruth=ÑÇÚæË
-I Samuel=ÕãæÇÆíá ÇáÇæá
-II Samuel=ÕãæÇÆíá ÇáËÇäí
-I Kings=ãáæß ÇáÇæá
-II Kings=ãáæß ÇáËÇäí
-I Chronicles=ÃÎÈÇÑ ÇáÃíÇã ÇáÃæá
-II Chronicles=ÃÎÈÇÑ ÇáÃíÇã ÇáËÇäí
-Ezra=ÚÒÑÇ
-Nehemiah=äÍãíÇ
-Esther=ÃÓÊíÑ
-Job=ÃíæÈ
-Psalms=ãÒÇãíÑ
-Proverbs=̋肇
-Ecclesiastes=ÇáÌÇãÚÉ
-Song of Solomon=äÔíÏ ÇáÃäÔÇÏ
-Isaiah=ÃÔÚíÇÁ
-Jeremiah=ÃÑãíÇ
-Lamentations=ãÑÇËí ÃÑãíÇ
-Ezekiel=ÍÒÞíÇá
-Daniel=ÏÇäíÇá
-Hosea=åæÔÚ
-Joel=íæÆíá
-Amos=ÚÇãæÓ
-Obadiah=ÚæÈÏíÇ
-Jonah=íæäÇä
-Micah=ãíÎÇ
-Nahum=äÇÍæã
-Habakkuk=ÍÈÞæÞ
-Zephaniah=ÕÝäíÇ
-Haggai=ÍÌí
-Zechariah=ÒßÑíÇ
-Malachi=ãáÇÎí
-Matthew=ãÊí
-Mark=ãÑÞÓ
-Luke=áæÞÇ
-John=íæÍäÇ
-Acts=ÃÚãÇá ÇáÑÓá
-Romans=ÑæãíÉ
-I Corinthians=ßæÑäËæÓ ÇáÃæáì
-II Corinthians=ßæÑäËæÓ ÇáËÇäíÉ
-Galatians=ÛáÇØíÉ
-Ephesians=ÇÝÓÓ
-Philippians=ÝíáÈì
-Colossians=ßæáæÓí
-I Thessalonians=ÊÓÇáæäíßì ÇáÃæáì
-II Thessalonians=ÊÓÇáæäíßì ÇáËÇäíÉ
-I Timothy=ÊíãæËÇæÓ ÇáÃæáì
-II Timothy=ÊíãæËÇæÓ ÇáËÇäíÉ
-Titus=ÊíØÓ
-Philemon=Ýíáãæä
-Hebrews=ÇáÚÈÑÇäííä
-James=íÚÞæÈ
-I Peter=ÈØÑÓ ÇáÃæáì
-II Peter=ÈØÑÓ ÇáËÇäíÉ
-I John=íæÍäÇ ÇáÃæáì
-II John=íæÍäÇ ÇáËÇäíÉ
-III John=íæÍäÇ ÇáËÇáËÉ
-Jude=íåæÐÇ
-Revelation of John=ÇáÑÄíÇ
-
-[Book Abbrevs]
-
-Êßæíä=1
-ÎÑæÌ=2
-áÇæííä=3
-ÚÏÏ=4
-ÊËäíÉ=5
-íÔæÚ=6
-ÞÖÇå=7
-ÑÇÚæË=8
-ÕãæÇÆíá ÇáÇæá=9
-ÕãæÇÆíá ÇáËÇäí=10
-ãáæß ÇáÇæá=11
-ãáæß ÇáËÇäí=12
-ÃÎÈÇÑ ÇáÃíÇã ÇáÃæá=13
-ÃÎÈÇÑ ÇáÃíÇã ÇáËÇäí=14
-ÚÒÑÇ=15
-äÍãíÇ=16
-ÃÓÊíÑ=17
-ÃíæÈ=18
-ãÒÇãíÑ=19
-̋肇=20
-ÇáÌÇãÚÉ=21
-äÔíÏ ÇáÃäÔÇÏ=22
-ÃÔÚíÇÁ=23
-ÃÑãíÇ=24
-ãÑÇËí ÃÑãíÇ=25
-ÍÒÞíÇá=26
-ÏÇäíÇá=27
-åæÔÚ=28
-íæÆíá=29
-ÚÇãæÓ=30
-ÚæÈÏíÇ=31
-íæäÇä=32
-ãíÎÇ=33
-äÇÍæã=34
-ÍÈÞæÞ=35
-ÕÝäíÇ=36
-ÍÌí=37
-ÒßÑíÇ=38
-ãáÇÎí=39
-ãÊí=40
-ãÑÞÓ=41
-áæÞÇ=42
-íæÍäÇ=43
-ÃÚãÇá ÇáÑÓá=44
-ÑæãíÉ=45
-ßæÑäËæÓ ÇáÃæáì=46
-ßæÑäËæÓ ÇáËÇäíÉ=47
-ÛáÇØíÉ=48
-ÇÝÓÓ=49
-ÝíáÈì=50
-ßæáæÓí=51
-ÊÓÇáæäíßì ÇáÃæáì=52
-ÊÓÇáæäíßì ÇáËÇäíÉ=53
-ÊíãæËÇæÓ ÇáÃæáì=54
-ÊíãæËÇæÓ ÇáËÇäíÉ=55
-ÊíØÓ=56
-Ýíáãæä=57
-ÇáÚÈÑÇäííä=58
-íÚÞæÈ=59
-ÈØÑÓ ÇáÃæáì=60
-ÈØÑÓ ÇáËÇäíÉ=61
-íæÍäÇ ÇáÃæáì=62
-íæÍäÇ ÇáËÇäíÉ=63
-íæÍäÇ ÇáËÇáËÉ=64
-íåæÐÇ=65
-ÇáÑÄíÇ=Rev
-
-
-ÊßÆÍÄ=Gen
-ÎÑÆÌ=Exod
-ÁÇÆÍÍÄ=Lev
-ÚÏÏ=Num
-ÊËÄÍÉ=Deut
-ÍÔÆÚ=Josh
-ÞÖÇÅ=Judg
-ÑÇÚÆË=Ruth
-ÕÃÆÇÆÍÁ ÇÁÇÆÁ=1Sam
-ÕÃÆÇÆÍÁ ÇÁËÇÄÍ=2Sam
-ÃÁÆß ÇÁÇÆÁ=1Kgs
-ÃÁÆß ÇÁËÇÄÍ=2Kgs
-ÃÎÈÇÑ ÇÁÃÍÇÃ ÇÁÃÆÁ=1Chr
-ÃÎÈÇÑ ÇÁÃÍÇÃ ÇÁËÇÄÍ=2Chr
-ÚÒÑÇ=Ezra
-ÄÍÃÍÇ=Neh
-ÃÓÊÍÑ=Esth
-ÃÍÆÈ=Job
-ÃÒÇÃÍÑ=Ps
-ÃÃËÇÁ=Prov
-ÇÁÌÇÃÚÉ=Eccl
-ÄÔÍÏ ÇÁÃÄÔÇÏ=Song
-ÃÔÚÍÇÁ=Isa
-ÃÑÃÍÇ=Jer
-ÃÑÇËÍ ÃÑÃÍÇ=Lam
-ÍÒÞÍÇÁ=Ezek
-ÏÇÄÍÇÁ=Dan
-ÅÆÔÚ=Hos
-ÍÆÆÍÁ=Joel
-ÚÇÃÆÓ=Amos
-ÚÆÈÏÍÇ=Obad
-ÍÆÄÇÄ=Jonah
-ÃÍÎÇ=Mic
-ÄÇÍÆÃ=Nah
-ÍÈÞÆÞ=Hab
-ÕÝÄÍÇ=Zeph
-ÍÌÍ=Hag
-ÒßÑÍÇ=Zech
-ÃÁÇÎÍ=Mal
-ÃÊÍ=Matt
-ÃÑÞÓ=Mark
-ÁÆÞÇ=Luke
-ÍÆÍÄÇ=John
-ÃÚÃÇÁ ÇÁÑÓÁ=Acts
-ÑÆÃÍÉ=Rom
-ßÆÑÄËÆÓ ÇÁÃÆÁÌ=1Cor
-ßÆÑÄËÆÓ ÇÁËÇÄÍÉ=2Cor
-ÛÁÇØÍÉ=Gal
-ÇÝÓÓ=Eph
-ÝÍÁÈÌ=Phil
-ßÆÁÆÓÍ=Col
-ÊÓÇÁÆÄÍßÌ ÇÁÃÆÁÌ=1Thess
-ÊÓÇÁÆÄÍßÌ ÇÁËÇÄÍÉ=2Thess
-ÊÍÃÆËÇÆÓ ÇÁÃÆÁÌ=1Tim
-ÊÍÃÆËÇÆÓ ÇÁËÇÄÍÉ=2Tim
-ÊÍØÓ=Titus
-ÝÍÁÃÆÄ=Phlm
-ÇÁÚÈÑÇÄÍÍÄ=Heb
-ÍÚÞÆÈ=Jas
-ÈØÑÓ ÇÁÃÆÁÌ=1Pet
-ÈØÑÓ ÇÁËÇÄÍÉ=2Pet
-ÍÆÍÄÇ ÇÁÃÆÁÌ=1John
-ÍÆÍÄÇ ÇÁËÇÄÍÉ=2John
-ÍÆÍÄÇ ÇÁËÇÁËÉ=3John
-ÍÅÆÐÇ=Jude
-
+[Meta]
+Name=ar_EG
+Description=Arabic (EG)
+Encoding=CP1256
+
+[Text]
+Genesis=Êßæíä
+Exodus=ÎÑæÌ
+Leviticus=áÇæííä
+Numbers=ÚÏÏ
+Deuteronomy=ÊËäíÉ
+Joshua=íÔæÚ
+Judges=ÞÖÇå
+Ruth=ÑÇÚæË
+I Samuel=ÕãæÇÆíá ÇáÇæá
+II Samuel=ÕãæÇÆíá ÇáËÇäí
+I Kings=ãáæß ÇáÇæá
+II Kings=ãáæß ÇáËÇäí
+I Chronicles=ÃÎÈÇÑ ÇáÃíÇã ÇáÃæá
+II Chronicles=ÃÎÈÇÑ ÇáÃíÇã ÇáËÇäí
+Ezra=ÚÒÑÇ
+Nehemiah=äÍãíÇ
+Esther=ÃÓÊíÑ
+Job=ÃíæÈ
+Psalms=ãÒÇãíÑ
+Proverbs=̋肇
+Ecclesiastes=ÇáÌÇãÚÉ
+Song of Solomon=äÔíÏ ÇáÃäÔÇÏ
+Isaiah=ÃÔÚíÇÁ
+Jeremiah=ÃÑãíÇ
+Lamentations=ãÑÇËí ÃÑãíÇ
+Ezekiel=ÍÒÞíÇá
+Daniel=ÏÇäíÇá
+Hosea=åæÔÚ
+Joel=íæÆíá
+Amos=ÚÇãæÓ
+Obadiah=ÚæÈÏíÇ
+Jonah=íæäÇä
+Micah=ãíÎÇ
+Nahum=äÇÍæã
+Habakkuk=ÍÈÞæÞ
+Zephaniah=ÕÝäíÇ
+Haggai=ÍÌí
+Zechariah=ÒßÑíÇ
+Malachi=ãáÇÎí
+Matthew=ãÊí
+Mark=ãÑÞÓ
+Luke=áæÞÇ
+John=íæÍäÇ
+Acts=ÃÚãÇá ÇáÑÓá
+Romans=ÑæãíÉ
+I Corinthians=ßæÑäËæÓ ÇáÃæáì
+II Corinthians=ßæÑäËæÓ ÇáËÇäíÉ
+Galatians=ÛáÇØíÉ
+Ephesians=ÇÝÓÓ
+Philippians=ÝíáÈì
+Colossians=ßæáæÓí
+I Thessalonians=ÊÓÇáæäíßì ÇáÃæáì
+II Thessalonians=ÊÓÇáæäíßì ÇáËÇäíÉ
+I Timothy=ÊíãæËÇæÓ ÇáÃæáì
+II Timothy=ÊíãæËÇæÓ ÇáËÇäíÉ
+Titus=ÊíØÓ
+Philemon=Ýíáãæä
+Hebrews=ÇáÚÈÑÇäííä
+James=íÚÞæÈ
+I Peter=ÈØÑÓ ÇáÃæáì
+II Peter=ÈØÑÓ ÇáËÇäíÉ
+I John=íæÍäÇ ÇáÃæáì
+II John=íæÍäÇ ÇáËÇäíÉ
+III John=íæÍäÇ ÇáËÇáËÉ
+Jude=íåæÐÇ
+Revelation of John=ÇáÑÄíÇ
+
+[Book Abbrevs]
+
+Êßæíä=1
+ÎÑæÌ=2
+áÇæííä=3
+ÚÏÏ=4
+ÊËäíÉ=5
+íÔæÚ=6
+ÞÖÇå=7
+ÑÇÚæË=8
+ÕãæÇÆíá ÇáÇæá=9
+ÕãæÇÆíá ÇáËÇäí=10
+ãáæß ÇáÇæá=11
+ãáæß ÇáËÇäí=12
+ÃÎÈÇÑ ÇáÃíÇã ÇáÃæá=13
+ÃÎÈÇÑ ÇáÃíÇã ÇáËÇäí=14
+ÚÒÑÇ=15
+äÍãíÇ=16
+ÃÓÊíÑ=17
+ÃíæÈ=18
+ãÒÇãíÑ=19
+̋肇=20
+ÇáÌÇãÚÉ=21
+äÔíÏ ÇáÃäÔÇÏ=22
+ÃÔÚíÇÁ=23
+ÃÑãíÇ=24
+ãÑÇËí ÃÑãíÇ=25
+ÍÒÞíÇá=26
+ÏÇäíÇá=27
+åæÔÚ=28
+íæÆíá=29
+ÚÇãæÓ=30
+ÚæÈÏíÇ=31
+íæäÇä=32
+ãíÎÇ=33
+äÇÍæã=34
+ÍÈÞæÞ=35
+ÕÝäíÇ=36
+ÍÌí=37
+ÒßÑíÇ=38
+ãáÇÎí=39
+ãÊí=40
+ãÑÞÓ=41
+áæÞÇ=42
+íæÍäÇ=43
+ÃÚãÇá ÇáÑÓá=44
+ÑæãíÉ=45
+ßæÑäËæÓ ÇáÃæáì=46
+ßæÑäËæÓ ÇáËÇäíÉ=47
+ÛáÇØíÉ=48
+ÇÝÓÓ=49
+ÝíáÈì=50
+ßæáæÓí=51
+ÊÓÇáæäíßì ÇáÃæáì=52
+ÊÓÇáæäíßì ÇáËÇäíÉ=53
+ÊíãæËÇæÓ ÇáÃæáì=54
+ÊíãæËÇæÓ ÇáËÇäíÉ=55
+ÊíØÓ=56
+Ýíáãæä=57
+ÇáÚÈÑÇäííä=58
+íÚÞæÈ=59
+ÈØÑÓ ÇáÃæáì=60
+ÈØÑÓ ÇáËÇäíÉ=61
+íæÍäÇ ÇáÃæáì=62
+íæÍäÇ ÇáËÇäíÉ=63
+íæÍäÇ ÇáËÇáËÉ=64
+íåæÐÇ=65
+ÇáÑÄíÇ=Rev
+
+
+ÊßÆÍÄ=Gen
+ÎÑÆÌ=Exod
+ÁÇÆÍÍÄ=Lev
+ÚÏÏ=Num
+ÊËÄÍÉ=Deut
+ÍÔÆÚ=Josh
+ÞÖÇÅ=Judg
+ÑÇÚÆË=Ruth
+ÕÃÆÇÆÍÁ ÇÁÇÆÁ=1Sam
+ÕÃÆÇÆÍÁ ÇÁËÇÄÍ=2Sam
+ÃÁÆß ÇÁÇÆÁ=1Kgs
+ÃÁÆß ÇÁËÇÄÍ=2Kgs
+ÃÎÈÇÑ ÇÁÃÍÇÃ ÇÁÃÆÁ=1Chr
+ÃÎÈÇÑ ÇÁÃÍÇÃ ÇÁËÇÄÍ=2Chr
+ÚÒÑÇ=Ezra
+ÄÍÃÍÇ=Neh
+ÃÓÊÍÑ=Esth
+ÃÍÆÈ=Job
+ÃÒÇÃÍÑ=Ps
+ÃÃËÇÁ=Prov
+ÇÁÌÇÃÚÉ=Eccl
+ÄÔÍÏ ÇÁÃÄÔÇÏ=Song
+ÃÔÚÍÇÁ=Isa
+ÃÑÃÍÇ=Jer
+ÃÑÇËÍ ÃÑÃÍÇ=Lam
+ÍÒÞÍÇÁ=Ezek
+ÏÇÄÍÇÁ=Dan
+ÅÆÔÚ=Hos
+ÍÆÆÍÁ=Joel
+ÚÇÃÆÓ=Amos
+ÚÆÈÏÍÇ=Obad
+ÍÆÄÇÄ=Jonah
+ÃÍÎÇ=Mic
+ÄÇÍÆÃ=Nah
+ÍÈÞÆÞ=Hab
+ÕÝÄÍÇ=Zeph
+ÍÌÍ=Hag
+ÒßÑÍÇ=Zech
+ÃÁÇÎÍ=Mal
+ÃÊÍ=Matt
+ÃÑÞÓ=Mark
+ÁÆÞÇ=Luke
+ÍÆÍÄÇ=John
+ÃÚÃÇÁ ÇÁÑÓÁ=Acts
+ÑÆÃÍÉ=Rom
+ßÆÑÄËÆÓ ÇÁÃÆÁÌ=1Cor
+ßÆÑÄËÆÓ ÇÁËÇÄÍÉ=2Cor
+ÛÁÇØÍÉ=Gal
+ÇÝÓÓ=Eph
+ÝÍÁÈÌ=Phil
+ßÆÁÆÓÍ=Col
+ÊÓÇÁÆÄÍßÌ ÇÁÃÆÁÌ=1Thess
+ÊÓÇÁÆÄÍßÌ ÇÁËÇÄÍÉ=2Thess
+ÊÍÃÆËÇÆÓ ÇÁÃÆÁÌ=1Tim
+ÊÍÃÆËÇÆÓ ÇÁËÇÄÍÉ=2Tim
+ÊÍØÓ=Titus
+ÝÍÁÃÆÄ=Phlm
+ÇÁÚÈÑÇÄÍÍÄ=Heb
+ÍÚÞÆÈ=Jas
+ÈØÑÓ ÇÁÃÆÁÌ=1Pet
+ÈØÑÓ ÇÁËÇÄÍÉ=2Pet
+ÍÆÍÄÇ ÇÁÃÆÁÌ=1John
+ÍÆÍÄÇ ÇÁËÇÄÍÉ=2John
+ÍÆÍÄÇ ÇÁËÇÁËÉ=3John
+ÍÅÆÐÇ=Jude
+
Modified: trunk/locales.d/nb-utf8.conf
===================================================================
--- trunk/locales.d/nb-utf8.conf 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/locales.d/nb-utf8.conf 2009-04-29 07:21:35 UTC (rev 2362)
@@ -1,295 +1,295 @@
-[Meta]
-Name=nb
-Description=Bokmål (Unicode)
-Encoding=UTF-8
-
-[Text]
-Genesis=1. Mosebok
-Exodus=2. Mosebok
-Leviticus=3. Mosebok
-Numbers=4. Mosebok
-Deuteronomy=5. Mosebok
-Joshua=Josva
-Judges=Dommerne
-Ruth=Rut
-I Samuel=1. Samuelsbok
-II Samuel=2. Samuelsbok
-I Kings=1. Kongebok
-II Kings=2. Kongebok
-I Chronicles=1. Krønikebok
-II Chronicles=2. Krønikebok
-Ezra=Esra
-Nehemiah=Nehemja
-Esther=Ester
-Job=Job
-Psalms=Salmene
-Proverbs=Ordspråkene
-Ecclesiastes=Forkynneren
-Song of Solomon=Høysangen
-Isaiah=Jesaja
-Jeremiah=Jeremia
-Lamentations=Klagesangene
-Ezekiel=Esekiel
-Daniel=Daniel
-Hosea=Hosea
-Joel=Joel
-Amos=Amos
-Obadiah=Obadja
-Jonah=Jona
-Micah=Mika
-Nahum=Nahum
-Habakkuk=Habakkuk
-Zephaniah=Sefanja
-Haggai=Haggai
-Zechariah=Sakarja
-Malachi=Malaki
-Matthew=Matteus
-Mark=Markus
-Luke=Lukas
-John=Johannes
-Acts=Apostlenes gjerninger
-Romans=Romerne
-I Corinthians=1. Korinter
-II Corinthians=2. Korinter
-Galatians=Galaterne
-Ephesians=Efeserne
-Philippians=Filipperne
-Colossians=Kolosserne
-I Thessalonians=1. Tessaloniker
-II Thessalonians=2. Tessaloniker
-I Timothy=1. Timoteus
-II Timothy=2. Timoteus
-Titus=Titus
-Philemon=Filemon
-Hebrews=Hebreerne
-James=Jakob
-I Peter=1. Peter
-II Peter=2. Peter
-I John=1. Johannes
-II John=2. Johannes
-III John=3. Johannes
-Jude=Judas
-Revelation of John=Johannes' åpenbaring
-
-[Book Abbrevs]
-
-1. MOSEBOK=Gen
-1 MOSEBOK=Gen
-1MOSEBOK=Gen
-
-2. MOSEBOK=Exod
-2 MOSEBOK=Exod
-2MOSEBOK=Exod
-
-3. MOSEBOK=Lev
-3 MOSEBOK=Lev
-3MOSEBOK=Lev
-
-4. MOSEBOK=Num
-4 MOSEBOK=Num
-4MOSEBOK=Num
-
-5. MOSEBOK=Deut
-5 MOSEBOK=Deut
-5MOSEBOK=Deut
-
-JOSVA=Josh
-DOMMERNE=Judg
-RUT=Ruth
-
-1. SAMUELSBOK=1Sam
-1 SAMUELSBOK=1Sam
-1SAMUELSBOK=1Sam
-
-2. SAMUELSBOK=2Sam
-2 SAMUELSBOK=2Sam
-2SAMUELSBOK=2Sam
-
-1. KONGEBOK=1Kgs
-1 KONGEBOK=1Kgs
-1KONGEBOK=1Kgs
-
-2. KONGEBOK=2Kgs
-2 KONGEBOK=2Kgs
-2KONGEBOK=2Kgs
-
-1. KRØNIKEBOK=1Chr
-1 KRØNIKEBOK=1Chr
-1KRØNIKEBOK=1Chr
-
-2. KRØNIKEBOK=2Chr
-2 KRØNIKEBOK=2Chr
-2KRØNIKEBOK=2Chr
-
-ESRA=Ezra
-NEHEMJA=Neh
-ESTER=Esth
-JOB=Job
-SALMENE=Ps
-ORDSPRÃ…KENE=Prov
-FORKYNNEREN=Eccl
-HØYSANGEN=Song
-JESAJA=Isa
-JEREMIA=Jer
-KLAGESANGENE=Lam
-ESEKIEL=Ezek
-DANIEL=Dan
-HOSEA=Hos
-JOEL=Joel
-AMOS=Amos
-OBADJA=Obad
-JONA=Jonah
-MIKA=Mic
-NAHUM=Nah
-HABAKKUK=Hab
-SEFANJA=Zeph
-HAGGAI=Hag
-SAKARJA=Zech
-MALAKI=Mal
-MATTEUS=Matt
-MARKUS=Mark
-LUKAS=Luke
-JOHANNES=John
-APOSTLENES GJERNINGER=Acts
-ROMERNE=Rom
-
-1. KORINTER=1Cor
-1 KORINTER=1Cor
-1KORINTER=1Cor
-
-2. KORINTER=2Cor
-2 KORINTER=2Cor
-2KORINTER=2Cor
-
-GALATERNE=Gal
-EFESERNE=Eph
-FILIPPERNE=Phil
-KOLOSSERNE=Col
-
-1. TESSALONIKER=1Thess
-1 TESSALONIKER=1Thess
-1TESSALONIKER=1Thess
-
-2. TESSALONIKER=2Thess
-2 TESSALONIKER=2Thess
-2TESSALONIKER=2Thess
-
-1. TIMOTEUS=1Tim
-1 TIMOTEUS=1Tim
-1TIMOTEUS=1Tim
-
-2. TIMOTEUS=2Tim
-2 TIMOTEUS=2Tim
-2TIMOTEUS=2Tim
-
-TITUS=Titus
-FILEMON=Phlm
-HEBREERNE=Heb
-JAKOB=Jas
-
-1. PETER=1Pet
-1 PETER=1Pet
-1PETER=1Pet
-
-2. PETER=2Pet
-2 PETER=2Pet
-2PETER=2Pet
-
-1. JOHANNES=1John
-1 JOHANNES=1John
-1JOHANNES=1John
-
-2. JOHANNES=2John
-2 JOHANNES=2John
-2JOHANNES=2John
-
-3. JOHANNES=3John
-3 JOHANNES=3John
-3JOHANNES=3John
-
-JUDAS=Jude
-JOHANNES' Ã…PENBARING=Rev
-
-1. MOS=Gen
-1MOS=Gen
-2. MOS=Exod
-2MOS=Exod
-3. MOS=Lev
-3MOS=Lev
-4. MOS=Num
-4MOS=Num
-5. MOS=Deut
-5MOS=Deut
-JOS=Josh
-DOM=Judg
-1. SAM=1Sam
-1SAM=1Sam
-2. SAM=2Sam
-2SAM=2Sam
-1. KONG=1Kgs
-1KONG=1Kgs
-2. KONG=2Kgs
-2KONG=2Kgs
-1. KRØN=1Chr
-1KRØN=1Chr
-2. KRØN=2Chr
-2KRØN=2Chr
-NEH=Neh
-EST=Esth
-SAL=Ps
-ORDSP=Prov
-FORK=Eccl
-HØYS=Song
-JES=Isa
-JER=Jer
-KLAG=Lam
-ESEK=Ezek
-DAN=Dan
-HOS=Hos
-AM=Amos
-OB=Obad
-MI=Mic
-NAH=Nah
-HAB=Hab
-SEF=Zeph
-HAG=Hag
-SAK=Zech
-MAL=Mal
-MATT=Matt
-MARK=Mark
-LUK=Luke
-JOH=John
-APG=Acts
-ROM=Rom
-1. KOR=1Cor
-1KOR=1Cor
-2. KOR=2Cor
-2KOR=2Cor
-GAL=Gal
-EF=Eph
-FIL=Phil
-KOL=Col
-1. TESS=1Thess
-1TESS=1Thess
-2. TESS=2Thess
-2TESS=2Thess
-1. TIM=1Tim
-1TIM=1Tim
-2. TIM=2Tim
-2TIM=2Tim
-TIT=Titus
-FILEM=Phlm
-HEBR=Heb
-JAK=Jas
-1. PET=1Pet
-1PET=1Pet
-2. PET=2Pet
-2PET=2Pet
-1. JOH=1John
-1JOH=1John
-2. JOH=2John
-2JOH=2John
-3. JOH=3John
-3JOH=3John
-JUD=Jude
-Ã…P=Rev
+[Meta]
+Name=nb
+Description=Bokmål (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josva
+Judges=Dommerne
+Ruth=Rut
+I Samuel=1. Samuelsbok
+II Samuel=2. Samuelsbok
+I Kings=1. Kongebok
+II Kings=2. Kongebok
+I Chronicles=1. Krønikebok
+II Chronicles=2. Krønikebok
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Salmene
+Proverbs=Ordspråkene
+Ecclesiastes=Forkynneren
+Song of Solomon=Høysangen
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagesangene
+Ezekiel=Esekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlenes gjerninger
+Romans=Romerne
+I Corinthians=1. Korinter
+II Corinthians=2. Korinter
+Galatians=Galaterne
+Ephesians=Efeserne
+Philippians=Filipperne
+Colossians=Kolosserne
+I Thessalonians=1. Tessaloniker
+II Thessalonians=2. Tessaloniker
+I Timothy=1. Timoteus
+II Timothy=2. Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebreerne
+James=Jakob
+I Peter=1. Peter
+II Peter=2. Peter
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Johannes' åpenbaring
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+1MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+2MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+3MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+4MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+5MOSEBOK=Deut
+
+JOSVA=Josh
+DOMMERNE=Judg
+RUT=Ruth
+
+1. SAMUELSBOK=1Sam
+1 SAMUELSBOK=1Sam
+1SAMUELSBOK=1Sam
+
+2. SAMUELSBOK=2Sam
+2 SAMUELSBOK=2Sam
+2SAMUELSBOK=2Sam
+
+1. KONGEBOK=1Kgs
+1 KONGEBOK=1Kgs
+1KONGEBOK=1Kgs
+
+2. KONGEBOK=2Kgs
+2 KONGEBOK=2Kgs
+2KONGEBOK=2Kgs
+
+1. KRØNIKEBOK=1Chr
+1 KRØNIKEBOK=1Chr
+1KRØNIKEBOK=1Chr
+
+2. KRØNIKEBOK=2Chr
+2 KRØNIKEBOK=2Chr
+2KRØNIKEBOK=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+SALMENE=Ps
+ORDSPRÃ…KENE=Prov
+FORKYNNEREN=Eccl
+HØYSANGEN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGESANGENE=Lam
+ESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLENES GJERNINGER=Acts
+ROMERNE=Rom
+
+1. KORINTER=1Cor
+1 KORINTER=1Cor
+1KORINTER=1Cor
+
+2. KORINTER=2Cor
+2 KORINTER=2Cor
+2KORINTER=2Cor
+
+GALATERNE=Gal
+EFESERNE=Eph
+FILIPPERNE=Phil
+KOLOSSERNE=Col
+
+1. TESSALONIKER=1Thess
+1 TESSALONIKER=1Thess
+1TESSALONIKER=1Thess
+
+2. TESSALONIKER=2Thess
+2 TESSALONIKER=2Thess
+2TESSALONIKER=2Thess
+
+1. TIMOTEUS=1Tim
+1 TIMOTEUS=1Tim
+1TIMOTEUS=1Tim
+
+2. TIMOTEUS=2Tim
+2 TIMOTEUS=2Tim
+2TIMOTEUS=2Tim
+
+TITUS=Titus
+FILEMON=Phlm
+HEBREERNE=Heb
+JAKOB=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+
+JUDAS=Jude
+JOHANNES' Ã…PENBARING=Rev
+
+1. MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4MOS=Num
+5. MOS=Deut
+5MOS=Deut
+JOS=Josh
+DOM=Judg
+1. SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2SAM=2Sam
+1. KONG=1Kgs
+1KONG=1Kgs
+2. KONG=2Kgs
+2KONG=2Kgs
+1. KRØN=1Chr
+1KRØN=1Chr
+2. KRØN=2Chr
+2KRØN=2Chr
+NEH=Neh
+EST=Esth
+SAL=Ps
+ORDSP=Prov
+FORK=Eccl
+HØYS=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+ESEK=Ezek
+DAN=Dan
+HOS=Hos
+AM=Amos
+OB=Obad
+MI=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+ROM=Rom
+1. KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1JOH=1John
+2. JOH=2John
+2JOH=2John
+3. JOH=3John
+3JOH=3John
+JUD=Jude
+Ã…P=Rev
Modified: trunk/locales.d/nb.conf
===================================================================
--- trunk/locales.d/nb.conf 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/locales.d/nb.conf 2009-04-29 07:21:35 UTC (rev 2362)
@@ -1,295 +1,295 @@
-[Meta]
-Name=nb
-Description=Bokmål
-Encoding=ISO8859-1
-
-[Text]
-Genesis=1. Mosebok
-Exodus=2. Mosebok
-Leviticus=3. Mosebok
-Numbers=4. Mosebok
-Deuteronomy=5. Mosebok
-Joshua=Josva
-Judges=Dommerne
-Ruth=Rut
-I Samuel=1. Samuelsbok
-II Samuel=2. Samuelsbok
-I Kings=1. Kongebok
-II Kings=2. Kongebok
-I Chronicles=1. Krønikebok
-II Chronicles=2. Krønikebok
-Ezra=Esra
-Nehemiah=Nehemja
-Esther=Ester
-Job=Job
-Psalms=Salmene
-Proverbs=Ordspråkene
-Ecclesiastes=Forkynneren
-Song of Solomon=Høysangen
-Isaiah=Jesaja
-Jeremiah=Jeremia
-Lamentations=Klagesangene
-Ezekiel=Esekiel
-Daniel=Daniel
-Hosea=Hosea
-Joel=Joel
-Amos=Amos
-Obadiah=Obadja
-Jonah=Jona
-Micah=Mika
-Nahum=Nahum
-Habakkuk=Habakkuk
-Zephaniah=Sefanja
-Haggai=Haggai
-Zechariah=Sakarja
-Malachi=Malaki
-Matthew=Matteus
-Mark=Markus
-Luke=Lukas
-John=Johannes
-Acts=Apostlenes gjerninger
-Romans=Romerne
-I Corinthians=1. Korinter
-II Corinthians=2. Korinter
-Galatians=Galaterne
-Ephesians=Efeserne
-Philippians=Filipperne
-Colossians=Kolosserne
-I Thessalonians=1. Tessaloniker
-II Thessalonians=2. Tessaloniker
-I Timothy=1. Timoteus
-II Timothy=2. Timoteus
-Titus=Titus
-Philemon=Filemon
-Hebrews=Hebreerne
-James=Jakob
-I Peter=1. Peter
-II Peter=2. Peter
-I John=1. Johannes
-II John=2. Johannes
-III John=3. Johannes
-Jude=Judas
-Revelation of John=Johannes' åpenbaring
-
-[Book Abbrevs]
-
-1. MOSEBOK=Gen
-1 MOSEBOK=Gen
-1MOSEBOK=Gen
-
-2. MOSEBOK=Exod
-2 MOSEBOK=Exod
-2MOSEBOK=Exod
-
-3. MOSEBOK=Lev
-3 MOSEBOK=Lev
-3MOSEBOK=Lev
-
-4. MOSEBOK=Num
-4 MOSEBOK=Num
-4MOSEBOK=Num
-
-5. MOSEBOK=Deut
-5 MOSEBOK=Deut
-5MOSEBOK=Deut
-
-JOSVA=Josh
-DOMMERNE=Judg
-RUT=Ruth
-
-1. SAMUELSBOK=1Sam
-1 SAMUELSBOK=1Sam
-1SAMUELSBOK=1Sam
-
-2. SAMUELSBOK=2Sam
-2 SAMUELSBOK=2Sam
-2SAMUELSBOK=2Sam
-
-1. KONGEBOK=1Kgs
-1 KONGEBOK=1Kgs
-1KONGEBOK=1Kgs
-
-2. KONGEBOK=2Kgs
-2 KONGEBOK=2Kgs
-2KONGEBOK=2Kgs
-
-1. KRØNIKEBOK=1Chr
-1 KRØNIKEBOK=1Chr
-1KRØNIKEBOK=1Chr
-
-2. KRØNIKEBOK=2Chr
-2 KRØNIKEBOK=2Chr
-2KRØNIKEBOK=2Chr
-
-ESRA=Ezra
-NEHEMJA=Neh
-ESTER=Esth
-JOB=Job
-SALMENE=Ps
-ORDSPRÅKENE=Prov
-FORKYNNEREN=Eccl
-HØYSANGEN=Song
-JESAJA=Isa
-JEREMIA=Jer
-KLAGESANGENE=Lam
-ESEKIEL=Ezek
-DANIEL=Dan
-HOSEA=Hos
-JOEL=Joel
-AMOS=Amos
-OBADJA=Obad
-JONA=Jonah
-MIKA=Mic
-NAHUM=Nah
-HABAKKUK=Hab
-SEFANJA=Zeph
-HAGGAI=Hag
-SAKARJA=Zech
-MALAKI=Mal
-MATTEUS=Matt
-MARKUS=Mark
-LUKAS=Luke
-JOHANNES=John
-APOSTLENES GJERNINGER=Acts
-ROMERNE=Rom
-
-1. KORINTER=1Cor
-1 KORINTER=1Cor
-1KORINTER=1Cor
-
-2. KORINTER=2Cor
-2 KORINTER=2Cor
-2KORINTER=2Cor
-
-GALATERNE=Gal
-EFESERNE=Eph
-FILIPPERNE=Phil
-KOLOSSERNE=Col
-
-1. TESSALONIKER=1Thess
-1 TESSALONIKER=1Thess
-1TESSALONIKER=1Thess
-
-2. TESSALONIKER=2Thess
-2 TESSALONIKER=2Thess
-2TESSALONIKER=2Thess
-
-1. TIMOTEUS=1Tim
-1 TIMOTEUS=1Tim
-1TIMOTEUS=1Tim
-
-2. TIMOTEUS=2Tim
-2 TIMOTEUS=2Tim
-2TIMOTEUS=2Tim
-
-TITUS=Titus
-FILEMON=Phlm
-HEBREERNE=Heb
-JAKOB=Jas
-
-1. PETER=1Pet
-1 PETER=1Pet
-1PETER=1Pet
-
-2. PETER=2Pet
-2 PETER=2Pet
-2PETER=2Pet
-
-1. JOHANNES=1John
-1 JOHANNES=1John
-1JOHANNES=1John
-
-2. JOHANNES=2John
-2 JOHANNES=2John
-2JOHANNES=2John
-
-3. JOHANNES=3John
-3 JOHANNES=3John
-3JOHANNES=3John
-
-JUDAS=Jude
-JOHANNES' ÅPENBARING=Rev
-
-1. MOS=Gen
-1MOS=Gen
-2. MOS=Exod
-2MOS=Exod
-3. MOS=Lev
-3MOS=Lev
-4. MOS=Num
-4MOS=Num
-5. MOS=Deut
-5MOS=Deut
-JOS=Josh
-DOM=Judg
-1. SAM=1Sam
-1SAM=1Sam
-2. SAM=2Sam
-2SAM=2Sam
-1. KONG=1Kgs
-1KONG=1Kgs
-2. KONG=2Kgs
-2KONG=2Kgs
-1. KRØN=1Chr
-1KRØN=1Chr
-2. KRØN=2Chr
-2KRØN=2Chr
-NEH=Neh
-EST=Esth
-SAL=Ps
-ORDSP=Prov
-FORK=Eccl
-HØYS=Song
-JES=Isa
-JER=Jer
-KLAG=Lam
-ESEK=Ezek
-DAN=Dan
-HOS=Hos
-AM=Amos
-OB=Obad
-MI=Mic
-NAH=Nah
-HAB=Hab
-SEF=Zeph
-HAG=Hag
-SAK=Zech
-MAL=Mal
-MATT=Matt
-MARK=Mark
-LUK=Luke
-JOH=John
-APG=Acts
-ROM=Rom
-1. KOR=1Cor
-1KOR=1Cor
-2. KOR=2Cor
-2KOR=2Cor
-GAL=Gal
-EF=Eph
-FIL=Phil
-KOL=Col
-1. TESS=1Thess
-1TESS=1Thess
-2. TESS=2Thess
-2TESS=2Thess
-1. TIM=1Tim
-1TIM=1Tim
-2. TIM=2Tim
-2TIM=2Tim
-TIT=Titus
-FILEM=Phlm
-HEBR=Heb
-JAK=Jas
-1. PET=1Pet
-1PET=1Pet
-2. PET=2Pet
-2PET=2Pet
-1. JOH=1John
-1JOH=1John
-2. JOH=2John
-2JOH=2John
-3. JOH=3John
-3JOH=3John
-JUD=Jude
-ÅP=Rev
+[Meta]
+Name=nb
+Description=Bokmål
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josva
+Judges=Dommerne
+Ruth=Rut
+I Samuel=1. Samuelsbok
+II Samuel=2. Samuelsbok
+I Kings=1. Kongebok
+II Kings=2. Kongebok
+I Chronicles=1. Krønikebok
+II Chronicles=2. Krønikebok
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Salmene
+Proverbs=Ordspråkene
+Ecclesiastes=Forkynneren
+Song of Solomon=Høysangen
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagesangene
+Ezekiel=Esekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlenes gjerninger
+Romans=Romerne
+I Corinthians=1. Korinter
+II Corinthians=2. Korinter
+Galatians=Galaterne
+Ephesians=Efeserne
+Philippians=Filipperne
+Colossians=Kolosserne
+I Thessalonians=1. Tessaloniker
+II Thessalonians=2. Tessaloniker
+I Timothy=1. Timoteus
+II Timothy=2. Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebreerne
+James=Jakob
+I Peter=1. Peter
+II Peter=2. Peter
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Johannes' åpenbaring
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+1MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+2MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+3MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+4MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+5MOSEBOK=Deut
+
+JOSVA=Josh
+DOMMERNE=Judg
+RUT=Ruth
+
+1. SAMUELSBOK=1Sam
+1 SAMUELSBOK=1Sam
+1SAMUELSBOK=1Sam
+
+2. SAMUELSBOK=2Sam
+2 SAMUELSBOK=2Sam
+2SAMUELSBOK=2Sam
+
+1. KONGEBOK=1Kgs
+1 KONGEBOK=1Kgs
+1KONGEBOK=1Kgs
+
+2. KONGEBOK=2Kgs
+2 KONGEBOK=2Kgs
+2KONGEBOK=2Kgs
+
+1. KRØNIKEBOK=1Chr
+1 KRØNIKEBOK=1Chr
+1KRØNIKEBOK=1Chr
+
+2. KRØNIKEBOK=2Chr
+2 KRØNIKEBOK=2Chr
+2KRØNIKEBOK=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+SALMENE=Ps
+ORDSPRÅKENE=Prov
+FORKYNNEREN=Eccl
+HØYSANGEN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGESANGENE=Lam
+ESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLENES GJERNINGER=Acts
+ROMERNE=Rom
+
+1. KORINTER=1Cor
+1 KORINTER=1Cor
+1KORINTER=1Cor
+
+2. KORINTER=2Cor
+2 KORINTER=2Cor
+2KORINTER=2Cor
+
+GALATERNE=Gal
+EFESERNE=Eph
+FILIPPERNE=Phil
+KOLOSSERNE=Col
+
+1. TESSALONIKER=1Thess
+1 TESSALONIKER=1Thess
+1TESSALONIKER=1Thess
+
+2. TESSALONIKER=2Thess
+2 TESSALONIKER=2Thess
+2TESSALONIKER=2Thess
+
+1. TIMOTEUS=1Tim
+1 TIMOTEUS=1Tim
+1TIMOTEUS=1Tim
+
+2. TIMOTEUS=2Tim
+2 TIMOTEUS=2Tim
+2TIMOTEUS=2Tim
+
+TITUS=Titus
+FILEMON=Phlm
+HEBREERNE=Heb
+JAKOB=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+
+JUDAS=Jude
+JOHANNES' ÅPENBARING=Rev
+
+1. MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4MOS=Num
+5. MOS=Deut
+5MOS=Deut
+JOS=Josh
+DOM=Judg
+1. SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2SAM=2Sam
+1. KONG=1Kgs
+1KONG=1Kgs
+2. KONG=2Kgs
+2KONG=2Kgs
+1. KRØN=1Chr
+1KRØN=1Chr
+2. KRØN=2Chr
+2KRØN=2Chr
+NEH=Neh
+EST=Esth
+SAL=Ps
+ORDSP=Prov
+FORK=Eccl
+HØYS=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+ESEK=Ezek
+DAN=Dan
+HOS=Hos
+AM=Amos
+OB=Obad
+MI=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+ROM=Rom
+1. KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1JOH=1John
+2. JOH=2John
+2JOH=2John
+3. JOH=3John
+3JOH=3John
+JUD=Jude
+ÅP=Rev
Modified: trunk/tests/icutest.cpp
===================================================================
--- trunk/tests/icutest.cpp 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/tests/icutest.cpp 2009-04-29 07:21:35 UTC (rev 2362)
@@ -16,8 +16,6 @@
*/
#include <iostream>
-#include <string>
-#include <malloc.h>
#include <string.h>
#include "unicode/utypes.h" /* Basic ICU data types */
@@ -41,7 +39,7 @@
uLength = strlen(samplestring);
conv = ucnv_open("utf-8", &status);
uBufSize = (uLength/ucnv_getMinCharSize(conv));
- uBuf = (UChar*)malloc(uBufSize * sizeof(UChar));
+ uBuf = new UChar[uBufSize];
target = uBuf;
@@ -50,5 +48,7 @@
cout << samplestring << endl;
+ delete [] uBuf;
+
return 0;
}
Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/usrinst.sh 2009-04-29 07:21:35 UTC (rev 2362)
@@ -36,8 +36,13 @@
#OPTIONS="--disable-utilities $OPTIONS"
-CPPFLAGS="$CFLAGS $CPPFLAGS -DUSBINARY" ./configure $OPTIONS $*
+# Use these for Windows DLL build
+#LIBS="-no-undefined"
+#OPTIONS="lt_cv_deplibs_check_method=pass_all $OPTIONS"
+LIBS="$LIBS" CPPFLAGS="$CFLAGS $CPPFLAGS -DUSBINARY" ./configure $OPTIONS $*
+
+
echo ""
echo ""
echo ""
Modified: trunk/utilities/diatheke/diathekemgr.h
===================================================================
--- trunk/utilities/diatheke/diathekemgr.h 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/utilities/diatheke/diathekemgr.h 2009-04-29 07:21:35 UTC (rev 2362)
@@ -21,7 +21,7 @@
#include <swmgr.h>
#include "diafiltmgr.h"
-enum PlatformIDs { WIN32S = 0, WIN9X, WINNT, WINCE };
+//enum PlatformIDs { WIN32S = 0, WIN9X, WINNT, WINCE };
class DiathekeMgr : public SWMgr {
SWFilter *arshaping;
Modified: trunk/utilities/lexdump.c
===================================================================
--- trunk/utilities/lexdump.c 2009-04-29 07:15:33 UTC (rev 2361)
+++ trunk/utilities/lexdump.c 2009-04-29 07:21:35 UTC (rev 2362)
@@ -52,9 +52,9 @@
tmpbuf = calloc(strlen(argv[1]) + 11,1);
sprintf(tmpbuf, "%s.idx", argv[1]);
- idxfd = open(tmpbuf, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+ idxfd = open(tmpbuf, O_RDONLY|O_BINARY);
sprintf(tmpbuf, "%s.dat", argv[1]);
- datfd = open(tmpbuf, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+ datfd = open(tmpbuf, O_RDONLY|O_BINARY);
free(tmpbuf);
offset = atoi(argv[2]) * 6;
More information about the sword-cvs
mailing list