[sword-svn] r2186 - trunk/locales.d

[scribe at www.crosswire.org]

Author: scribe
Date: 2008-07-21 04:28:48 -0700 (Mon, 21 Jul 2008)
New Revision: 2186

Modified:
   trunk/locales.d/abbr.conf
   trunk/locales.d/af.conf
   trunk/locales.d/da-utf8.conf
   trunk/locales.d/da.conf
   trunk/locales.d/de_abbrev-utf8.conf
   trunk/locales.d/de_abbrev.conf
   trunk/locales.d/es-utf8.conf
   trunk/locales.d/es.conf
   trunk/locales.d/et-utf8.conf
   trunk/locales.d/et.conf
   trunk/locales.d/et_abbr-utf8.conf
   trunk/locales.d/et_abbr.conf
   trunk/locales.d/fi-utf8.conf
   trunk/locales.d/fi.conf
   trunk/locales.d/fr-utf8.conf
   trunk/locales.d/fr.conf
   trunk/locales.d/fr_abbrev-utf8.conf
   trunk/locales.d/fr_abbrev.conf
   trunk/locales.d/it-utf8.conf
   trunk/locales.d/it.conf
   trunk/locales.d/ja.conf
   trunk/locales.d/lt-utf8.conf
   trunk/locales.d/nl.conf
   trunk/locales.d/no-utf8.conf
   trunk/locales.d/no.conf
   trunk/locales.d/pt-utf8.conf
   trunk/locales.d/pt.conf
   trunk/locales.d/sk-utf8.conf
   trunk/locales.d/sk.conf
   trunk/locales.d/sl.conf
   trunk/locales.d/sv-utf8.conf
   trunk/locales.d/sv.conf
Log:
Found many locales with extraneous spaces after book numbers


Modified: trunk/locales.d/abbr.conf
===================================================================
--- trunk/locales.d/abbr.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/abbr.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/af.conf
===================================================================
--- trunk/locales.d/af.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/af.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -113,7 +113,7 @@
 2CORINTHIANS=47   
 2JN=63   
 2JOHN=63   
-2KGS=12 
+2KGS=2Kgs
 2KINGS=12   
 2PETER=61   
 2PTR=61   
@@ -186,7 +186,7 @@
 IIIJOHN=64   
 IIJN=63   
 IIJOHN=63   
-IIKGS=12 
+IIKGS=2Kgs
 IIKINGS=12   
 IIPETER=61   
 IIPTR=61   

Modified: trunk/locales.d/da-utf8.conf
===================================================================
--- trunk/locales.d/da-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/da-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/da.conf
===================================================================
--- trunk/locales.d/da.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/da.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/de_abbrev-utf8.conf
===================================================================
--- trunk/locales.d/de_abbrev-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/de_abbrev-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -84,145 +84,145 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
+IKINGS=1Kgs
 IPETER=1Pet
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-J=43  
-JAMES=59   
-JAS=59   
-JEREMIAH=24   
-JN=43  
-JO=43  
-JOB=18   
-JOEL=29   
-JOHN=43   
-JONAH=32   
-JOSHUA=6   
-JUDE=65   
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -230,7 +230,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/de_abbrev.conf
===================================================================
--- trunk/locales.d/de_abbrev.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/de_abbrev.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -84,145 +84,145 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
+IKINGS=1Kgs
 IPETER=1Pet
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-J=43  
-JAMES=59   
-JAS=59   
-JEREMIAH=24   
-JN=43  
-JO=43  
-JOB=18   
-JOEL=29   
-JOHN=43   
-JONAH=32   
-JOSHUA=6   
-JUDE=65   
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -230,7 +230,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/es-utf8.conf
===================================================================
--- trunk/locales.d/es-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/es-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -78,146 +78,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -225,7 +225,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/es.conf
===================================================================
--- trunk/locales.d/es.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/es.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -78,146 +78,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -225,7 +225,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/et-utf8.conf
===================================================================
--- trunk/locales.d/et-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/et-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -78,146 +78,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -225,7 +225,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/et.conf
===================================================================
--- trunk/locales.d/et.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/et.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -78,146 +78,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -225,7 +225,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/et_abbr-utf8.conf
===================================================================
--- trunk/locales.d/et_abbr-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/et_abbr-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,145 +77,145 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
+IKINGS=1Kgs
 IPETER=1Pet
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-J=43  
-JAMES=59   
-JAS=59   
-JEREMIAH=24   
-JN=43  
-JO=43  
-JOB=18   
-JOEL=29   
-JOHN=43   
-JONAH=32   
-JOSHUA=6   
-JUDE=65   
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -223,7 +223,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/et_abbr.conf
===================================================================
--- trunk/locales.d/et_abbr.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/et_abbr.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,145 +77,145 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
+IKINGS=1Kgs
 IPETER=1Pet
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-J=43  
-JAMES=59   
-JAS=59   
-JEREMIAH=24   
-JN=43  
-JO=43  
-JOB=18   
-JOEL=29   
-JOHN=43   
-JONAH=32   
-JOSHUA=6   
-JUDE=65   
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -223,7 +223,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/fi-utf8.conf
===================================================================
--- trunk/locales.d/fi-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/fi-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/fi.conf
===================================================================
--- trunk/locales.d/fi.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/fi.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/fr-utf8.conf
===================================================================
--- trunk/locales.d/fr-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/fr-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=2  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Exod
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-J=43  
-JAMES=59   
-JAS=59   
-JEREMIAH=24   
-JN=43  
-JO=6  
-JOB=18   
-JOEL=29   
-JOHN=43   
-JONAH=32   
-JOSHUA=6   
-JUD=65   
-JUDE=65   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=Josh
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Jude
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic
@@ -324,145 +324,145 @@
 JUDE=Jude
 APOCALYPSE=Rev
 
-1 C=46 
-1C=46 
-1 CH=13 
-1CH=13 
+1 C=1Cor
+1C=1Cor
+1 CH=1Chr
+1CH=1Chr
 1 CHR=1Chr
-1CHR=13 
+1CHR=1Chr
 1 CHRO=1Chr
-1CHRO=13 
-1 CO=46 
-1CO=46 
+1CHRO=1Chr
+1 CO=1Cor
+1CO=1Cor
 1 COR=1Cor
-1COR=46 
-1 J=62 
-1J=62 
-1 JE=62 
-1JE=62 
-1 JEA=62 
-1JEA=62 
+1COR=1Cor
+1 J=1John
+1J=1John
+1 JE=1John
+1JE=1John
+1 JEA=1John
+1JEA=1John
 1 JN=1John
-1JN=62 
-1 P=60 
-1P=60 
-1 PI=60 
-1PI=60 
+1JN=1John
+1 P=1Pet
+1P=1Pet
+1 PI=1Pet
+1PI=1Pet
 1 PIE=1Pet
-1PIE=60 
-1 R=11 
-1R=11 
-1 RO=11 
-1RO=11 
-1 ROI=11 
+1PIE=1Pet
+1 R=1Kgs
+1R=1Kgs
+1 RO=1Kgs
+1RO=1Kgs
+1 ROI=1Kgs
 1ROI=1Kgs
-1 S=9 
-1S=9 
-1 SA=9 
-1SA=9 
+1 S=1Sam
+1S=1Sam
+1 SA=1Sam
+1SA=1Sam
 1 SAM=1Sam
-1SAM=9 
+1SAM=1Sam
 1 T=1Thess
 1T=1Thess
-1 TH=52 
-1TH=52 
+1 TH=1Thess
+1TH=1Thess
 1 THE=1Thess
-1THE=52 
-1 TI=54 
-1TI=54 
-1 TIM=54 
-1TIM=54 
+1THE=1Thess
+1 TI=1Tim
+1TI=1Tim
+1 TIM=1Tim
+1TIM=1Tim
 1 TIMOTHEE=1Tim
 1TIMOTHEE=1Tim
 1 TM=1Tim
 1TM=1Tim
-2 C=47 
-2C=47 
-2 CH=14 
-2CH=14 
-2 CHR=14 
-2CHR=14 
+2 C=2Cor
+2C=2Cor
+2 CH=2Chr
+2CH=2Chr
+2 CHR=2Chr
+2CHR=2Chr
 2 CHRO=2Chr
-2CHRO=14 
-2 CO=47 
-2CO=47 
+2CHRO=2Chr
+2 CO=2Cor
+2CO=2Cor
 2 COR=2Cor
-2COR=47 
-2 J=63 
-2J=63 
-2 JE=63 
-2JE=63 
-2 JEA=63 
-2JEA=63 
+2COR=2Cor
+2 J=2John
+2J=2John
+2 JE=2John
+2JE=2John
+2 JEA=2John
+2JEA=2John
 2 JN=2John
-2JN=63 
-2 P=61 
-2P=61 
-2 PI=61 
-2PI=61 
+2JN=2John
+2 P=2Pet
+2P=2Pet
+2 PI=2Pet
+2PI=2Pet
 2 PIE=2Pet
-2PIE=61 
-2 R=12 
-2R=12 
-2 RO=12 
-2RO=12 
-2 ROI=12 
+2PIE=2Pet
+2 R=2Kgs
+2R=2Kgs
+2 RO=2Kgs
+2RO=2Kgs
+2 ROI=2Kgs
 2ROI=2Kgs
-2 S=10 
-2S=10 
-2 SA=10 
-2SA=10 
+2 S=2Sam
+2S=2Sam
+2 SA=2Sam
+2SA=2Sam
 2 SAM=2Sam
 2SAM=2Sam
 2 T=2Thess
-2T=53 
-2 TH=53 
-2TH=53 
+2T=2Thess
+2 TH=2Thess
+2TH=2Thess
 2 THE=2Thess
-2THE=53 
-2 TI=55 
-2TI=55 
-2 TIM=55 
-2TIM=55 
+2THE=2Thess
+2 TI=2Tim
+2TI=2Tim
+2 TIM=2Tim
+2TIM=2Tim
 2 TIMOTHEE=2Tim
 2TIMOTHEE=2Tim
 2 TM=2Tim
 2TM=2Tim
-3 J=64 
-3J=64 
-3 JE=64 
-3JE=64 
-3 JEA=64 
-3JEA=64 
+3 J=3John
+3J=3John
+3 JE=3John
+3JE=3John
+3 JEA=3John
+3JEA=3John
 3 JN=3John
 3JN=3John
 A=Acts
-AB=31 
-ABD=31 
+AB=Obad
+ABD=Obad
 ABDI=Obad
-AC=44 
-ACT=44 
+AC=Acts
+ACT=Acts
 ACTE=Acts
-AG=37 
-AGG=37 
-AGGE=37 
-AGGÉ=37 
+AG=Hag
+AGG=Hag
+AGGE=Hag
+AGGÉ=Hag
 AGGEE=Hag
-AM=30 
-AMO=30 
-AP=66 
-APO=66 
+AM=Amos
+AMO=Amos
+AP=Rev
+APO=Rev
 APOC=Rev
 B=Heb
-CA=22 
-CAN=22 
-CANT=22 
+CA=Song
+CAN=Song
+CANT=Song
 CDC=Song
-CO=51 
-COL=51 
+CO=Col
+COL=Col
 COLO=Col
 CT=Song
-DA=27 
+DA=Dan
 DAN=Dan
 DANI=Dan
 DE=Deut
@@ -473,111 +473,111 @@
 DT=Deut
 E=Exod
 É=Eph
-EC=21 
-ECC=21 
-ECCL=21 
+EC=Eccl
+ECC=Eccl
+ECCL=Eccl
 ECCLESIASTE=Eccl
 ÉC=Eccl
 ÉCC=Eccl
 ÉCCL=Eccl
 ECL=Eccl
 ÉCL=Eccl
-EP=49 
-ÉP=49 
-EPH=49 
-ÉPH=49 
-EPHE=49 
-ÉPHE=49 
-EPHÉ=49 
+EP=Eph
+ÉP=Eph
+EPH=Eph
+ÉPH=Eph
+EPHE=Eph
+ÉPHE=Eph
+EPHÉ=Eph
 ÉPHÉ=Eph
 EPHESIENS=Eph
 ÉPHÉSIENS=Eph
-ES=23 
+ES=Isa
 ÉS=Isa
-ESA=23 
+ESA=Isa
 ÉSA=Isa
-ESAI=23 
-ESAÏ=23 
+ESAI=Isa
+ESAÏ=Isa
 ÉSAÏ=Isa
 ESAIE=Isa
 ÉSAIE=Isa
 ÉSAÏE=Isa
-ESD=15 
+ESD=Ezra
 ESDR=Ezra
 ÉSD=Ezra
-EST=17 
+EST=Esth
 ESTH=Esth
 ÉST=Esth
-EX=2 
+EX=Exod
 EXO=Exod
 EXOD=Exod
-EZ=26 
-EZE=26 
-ÉZE=26 
-EZÉ=26 
-ÉZÉ=26 
+EZ=Ezek
+EZE=Ezek
+ÉZE=Ezek
+EZÉ=Ezek
+ÉZÉ=Ezek
 EZEC=Ezek
 ÉZEC=Ezek
 EZÉC=Ezek
 ÉZÉC=Ezek
 EZECHIEL=Ezek
 F=Eph
-G=1 
-GA=48 
-GAL=48 
+G=Gen
+GA=Gal
+GAL=Gal
 GALA=Gal
-GE=1 
+GE=Gen
 GEN=Gen
-GENE=1 
+GENE=Gen
 GENÈ=Gen
 GENESE=Gen
 GÉ=Gen
 GÉN=Gen
 GN=Gen
 H=Hab
-HA=35 
-HAB=35 
+HA=Hab
+HAB=Hab
 HABA=Hab
 HABACUC=Hab
 HABAQUQ=Hab
-HE=58 
-HÉ=58 
-HEB=58 
-HÉB=58 
+HE=Heb
+HÉ=Heb
+HEB=Heb
+HÉB=Heb
 HEBREUX=Heb
 I=Isa
-IS=23 
-ISA=23 
-ISAI=23 
-ISAÏ=23 
+IS=Isa
+ISA=Isa
+ISAI=Isa
+ISAÏ=Isa
 ISAIE=Isa
 J=Josh
-JA=59 
-JAC=59 
+JA=Jas
+JAC=Jas
 JACQ=Jas
 JB=Job
 JC=Jas
 JD=Jude
 JÉ=Jer
-JE=43 
-JEA=43 
-JER=24 
-JÉR=24 
-JERE=24 
+JE=John
+JEA=John
+JER=Jer
+JÉR=Jer
+JERE=Jer
 JÉRE=Jer
 JERÉ=Jer
 JÉRÉ=Jer
 JEREMIE=Jer
 JG=Judg
-JL=29 
+JL=Joel
 JN=John
 JOB=Job
-JOE=29 
-JOË=29 
+JOE=Joel
+JOË=Joel
 JOEL=Joel
 JON=Jonah
 JONA=Jonah
-JOS=6 
+JOS=Josh
 JOSUE=Josh
 JR=Jer
 JS=Josh
@@ -587,106 +587,106 @@
 JUGE=Judg
 K=Hab
 L=Lev
-LA=25 
-LAM=25 
+LA=Lam
+LAM=Lam
 LAME=Lam
 LC=Luke
 LDJ=Lam
-LE=3 
-LÉ=3 
-LEV=3 
+LE=Lev
+LÉ=Lev
+LEV=Lev
 LÉV=Lev
 LEVI=Lev
 LÉVI=Lev
 LEVITIQUE=Lev
 LM=Lam
-LU=42 
+LU=Luke
 LUC=Luke
 LV=Lev
 M=Matt
 MA=Mal
-MAL=39 
+MAL=Mal
 MALA=Mal
-MAR=41 
-MAT=40 
-MATT=40 
+MAR=Mark
+MAT=Matt
+MATT=Matt
 MC=Mark
-MI=33 
-MIC=33 
-MICH=33 
+MI=Mic
+MIC=Mic
+MICH=Mic
 MICHEE=Mic
 ML=Mal
-MR=41 
+MR=Mark
 MT=Matt
 N=Num
-NA=34 
-NAH=34 
+NA=Nah
+NAH=Nah
 NAHU=Hab
 NB=Num
-NE=16 
-NÉ=16 
-NEH=16 
-NÉH=16 
+NE=Neh
+NÉ=Neh
+NEH=Neh
+NÉH=Neh
 NEHE=Neh
 NÉHE=Neh
 NEHÉ=Neh
 NÉHÉ=Neh
 NEHEMIE=Neh
-NO=4 
-NOM=4 
+NO=Num
+NOM=Num
 NOMB=Num
 O=Hos
-OS=28 
-OSE=28 
-OSÉ=28 
+OS=Hos
+OSE=Hos
+OSÉ=Hos
 OSEE=Hos
 P=Ps
-PH=50 
-PHI=50 
+PH=Phil
+PHI=Phil
 PHIL=Phil
-PHIL=57 
+PHIL=Phlm
 PHILEMON=Phlm
-PHM=57 
-PR=20 
+PHM=Phlm
+PR=Prov
 PRE=Eccl
 PRÉ=Eccl
 PRED=Eccl
 PRÉD=Eccl
 PREDICATEUR=Eccl
-PRO=20 
+PRO=Prov
 PROV=Prov
-PS=19 
-PSA=19 
+PS=Ps
+PSA=Ps
 PSAU=Ps
 QO=Eccl
 R=Rom
-RE=66 
-RÉ=66 
-REV=66 
-RÉV=66 
-REVE=66 
-RÉVE=66 
-REVÉ=66 
+RE=Rev
+RÉ=Rev
+REV=Rev
+RÉV=Rev
+REVE=Rev
+RÉVE=Rev
+REVÉ=Rev
 RÉVÉ=Rev
 RM=Rom
-RO=45 
+RO=Rom
 ROM=Rom
 RT=Ruth
-RU=8 
+RU=Ruth
 RUT=Ruth
 S=Zeph
-SO=36 
-SOP=36 
+SO=Zeph
+SOP=Zeph
 SOPH=Zeph
 T=Titus
-TI=56 
+TI=Titus
 TIT=Titus
 TT=Titus
 U=Judg
 V=Lev
 Z=Zech
-ZA=38 
-ZAC=38 
+ZA=Zech
+ZAC=Zech
 ZACH=Zech
 
 

Modified: trunk/locales.d/fr.conf
===================================================================
--- trunk/locales.d/fr.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/fr.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=2  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Exod
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-J=43  
-JAMES=59   
-JAS=59   
-JEREMIAH=24   
-JN=43  
-JO=6  
-JOB=18   
-JOEL=29   
-JOHN=43   
-JONAH=32   
-JOSHUA=6   
-JUD=65   
-JUDE=65   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=Josh
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Jude
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic
@@ -324,145 +324,145 @@
 JUDE=Jude
 APOCALYPSE=Rev
 
-1 C=46 
-1C=46 
-1 CH=13 
-1CH=13 
+1 C=1Cor
+1C=1Cor
+1 CH=1Chr
+1CH=1Chr
 1 CHR=1Chr
-1CHR=13 
+1CHR=1Chr
 1 CHRO=1Chr
-1CHRO=13 
-1 CO=46 
-1CO=46 
+1CHRO=1Chr
+1 CO=1Cor
+1CO=1Cor
 1 COR=1Cor
-1COR=46 
-1 J=62 
-1J=62 
-1 JE=62 
-1JE=62 
-1 JEA=62 
-1JEA=62 
+1COR=1Cor
+1 J=1John
+1J=1John
+1 JE=1John
+1JE=1John
+1 JEA=1John
+1JEA=1John
 1 JN=1John
-1JN=62 
-1 P=60 
-1P=60 
-1 PI=60 
-1PI=60 
+1JN=1John
+1 P=1Pet
+1P=1Pet
+1 PI=1Pet
+1PI=1Pet
 1 PIE=1Pet
-1PIE=60 
-1 R=11 
-1R=11 
-1 RO=11 
-1RO=11 
-1 ROI=11 
+1PIE=1Pet
+1 R=1Kgs
+1R=1Kgs
+1 RO=1Kgs
+1RO=1Kgs
+1 ROI=1Kgs
 1ROI=1Kgs
-1 S=9 
-1S=9 
-1 SA=9 
-1SA=9 
+1 S=1Sam
+1S=1Sam
+1 SA=1Sam
+1SA=1Sam
 1 SAM=1Sam
-1SAM=9 
+1SAM=1Sam
 1 T=1Thess
 1T=1Thess
-1 TH=52 
-1TH=52 
+1 TH=1Thess
+1TH=1Thess
 1 THE=1Thess
-1THE=52 
-1 TI=54 
-1TI=54 
-1 TIM=54 
-1TIM=54 
+1THE=1Thess
+1 TI=1Tim
+1TI=1Tim
+1 TIM=1Tim
+1TIM=1Tim
 1 TIMOTHEE=1Tim
 1TIMOTHEE=1Tim
 1 TM=1Tim
 1TM=1Tim
-2 C=47 
-2C=47 
-2 CH=14 
-2CH=14 
-2 CHR=14 
-2CHR=14 
+2 C=2Cor
+2C=2Cor
+2 CH=2Chr
+2CH=2Chr
+2 CHR=2Chr
+2CHR=2Chr
 2 CHRO=2Chr
-2CHRO=14 
-2 CO=47 
-2CO=47 
+2CHRO=2Chr
+2 CO=2Cor
+2CO=2Cor
 2 COR=2Cor
-2COR=47 
-2 J=63 
-2J=63 
-2 JE=63 
-2JE=63 
-2 JEA=63 
-2JEA=63 
+2COR=2Cor
+2 J=2John
+2J=2John
+2 JE=2John
+2JE=2John
+2 JEA=2John
+2JEA=2John
 2 JN=2John
-2JN=63 
-2 P=61 
-2P=61 
-2 PI=61 
-2PI=61 
+2JN=2John
+2 P=2Pet
+2P=2Pet
+2 PI=2Pet
+2PI=2Pet
 2 PIE=2Pet
-2PIE=61 
-2 R=12 
-2R=12 
-2 RO=12 
-2RO=12 
-2 ROI=12 
+2PIE=2Pet
+2 R=2Kgs
+2R=2Kgs
+2 RO=2Kgs
+2RO=2Kgs
+2 ROI=2Kgs
 2ROI=2Kgs
-2 S=10 
-2S=10 
-2 SA=10 
-2SA=10 
+2 S=2Sam
+2S=2Sam
+2 SA=2Sam
+2SA=2Sam
 2 SAM=2Sam
 2SAM=2Sam
 2 T=2Thess
-2T=53 
-2 TH=53 
-2TH=53 
+2T=2Thess
+2 TH=2Thess
+2TH=2Thess
 2 THE=2Thess
-2THE=53 
-2 TI=55 
-2TI=55 
-2 TIM=55 
-2TIM=55 
+2THE=2Thess
+2 TI=2Tim
+2TI=2Tim
+2 TIM=2Tim
+2TIM=2Tim
 2 TIMOTHEE=2Tim
 2TIMOTHEE=2Tim
 2 TM=2Tim
 2TM=2Tim
-3 J=64 
-3J=64 
-3 JE=64 
-3JE=64 
-3 JEA=64 
-3JEA=64 
+3 J=3John
+3J=3John
+3 JE=3John
+3JE=3John
+3 JEA=3John
+3JEA=3John
 3 JN=3John
 3JN=3John
 A=Acts
-AB=31 
-ABD=31 
+AB=Obad
+ABD=Obad
 ABDI=Obad
-AC=44 
-ACT=44 
+AC=Acts
+ACT=Acts
 ACTE=Acts
-AG=37 
-AGG=37 
-AGGE=37 
-AGGÉ=37 
+AG=Hag
+AGG=Hag
+AGGE=Hag
+AGGÉ=Hag
 AGGEE=Hag
-AM=30 
-AMO=30 
-AP=66 
-APO=66 
+AM=Amos
+AMO=Amos
+AP=Rev
+APO=Rev
 APOC=Rev
 B=Heb
-CA=22 
-CAN=22 
-CANT=22 
+CA=Song
+CAN=Song
+CANT=Song
 CDC=Song
-CO=51 
-COL=51 
+CO=Col
+COL=Col
 COLO=Col
 CT=Song
-DA=27 
+DA=Dan
 DAN=Dan
 DANI=Dan
 DE=Deut
@@ -473,109 +473,109 @@
 DT=Deut
 E=Exod
 É=Eph
-EC=21 
-ECC=21 
-ECCL=21 
+EC=Eccl
+ECC=Eccl
+ECCL=Eccl
 ECCLESIASTE=Eccl
 ÉC=Eccl
 ÉCC=Eccl
 ÉCCL=Eccl
 ECL=Eccl
 ÉCL=Eccl
-EP=49 
-ÉP=49 
-EPH=49 
-ÉPH=49 
-EPHE=49 
-ÉPHE=49 
-EPHÉ=49 
-ÉPHÉ=49 
+EP=Eph
+ÉP=Eph
+EPH=Eph
+ÉPH=Eph
+EPHE=Eph
+ÉPHE=Eph
+EPHÉ=Eph
+ÉPHÉ=Eph
 EPHESIENS=Eph
-ES=23 
+ES=Isa
 ÉS=Isa
-ESA=23 
+ESA=Isa
 ÉSA=Isa
-ESAI=23 
-ESAÏ=23 
+ESAI=Isa
+ESAÏ=Isa
 ÉSAÏ=Isa
 ESAIE=Isa
 ÉSAIE=Isa
-ESD=15 
+ESD=Ezra
 ESDR=Ezra
 ÉSD=Ezra
-EST=17 
+EST=Esth
 ESTH=Esth
 ÉST=Esth
-EX=2 
+EX=Exod
 EXO=Exod
 EXOD=Exod
-EZ=26 
-EZE=26 
-ÉZE=26 
-EZÉ=26 
-ÉZÉ=26 
+EZ=Ezek
+EZE=Ezek
+ÉZE=Ezek
+EZÉ=Ezek
+ÉZÉ=Ezek
 EZEC=Ezek
 ÉZEC=Ezek
 EZÉC=Ezek
 ÉZÉC=Ezek
 EZECHIEL=Ezek
 F=Eph
-G=1 
-GA=48 
-GAL=48 
+G=Gen
+GA=Gal
+GAL=Gal
 GALA=Gal
-GE=1 
+GE=Gen
 GEN=Gen
-GENE=1 
+GENE=Gen
 GENÈ=Gen
 GENESE=Gen
 GÉ=Gen
 GÉN=Gen
 GN=Gen
 H=Hab
-HA=35 
-HAB=35 
+HA=Hab
+HAB=Hab
 HABA=Hab
 HABACUC=Hab
 HABAQUQ=Hab
-HE=58 
-HÉ=58 
-HEB=58 
-HÉB=58 
+HE=Heb
+HÉ=Heb
+HEB=Heb
+HÉB=Heb
 HEBREUX=Heb
 I=Isa
-IS=23 
-ISA=23 
-ISAI=23 
-ISAÏ=23 
+IS=Isa
+ISA=Isa
+ISAI=Isa
+ISAÏ=Isa
 ISAIE=Isa
 J=Josh
-JA=59 
-JAC=59 
+JA=Jas
+JAC=Jas
 JACQ=Jas
 JB=Job
 JC=Jas
 JD=Jude
 JÉ=Jer
-JE=43 
-JEA=43 
-JER=24 
-JÉR=24 
-JERE=24 
+JE=John
+JEA=John
+JER=Jer
+JÉR=Jer
+JERE=Jer
 JÉRE=Jer
 JERÉ=Jer
 JÉRÉ=Jer
 JEREMIE=Jer
 JG=Judg
-JL=29 
+JL=Joel
 JN=John
 JOB=Job
-JOE=29 
-JOË=29 
+JOE=Joel
+JOË=Joel
 JOEL=Joel
 JON=Jonah
 JONA=Jonah
-JOS=6 
+JOS=Josh
 JOSUE=Josh
 JR=Jer
 JS=Josh
@@ -585,106 +585,106 @@
 JUGE=Judg
 K=Hab
 L=Lev
-LA=25 
-LAM=25 
+LA=Lam
+LAM=Lam
 LAME=Lam
 LC=Luke
 LDJ=Lam
-LE=3 
-LÉ=3 
-LEV=3 
+LE=Lev
+LÉ=Lev
+LEV=Lev
 LÉV=Lev
 LEVI=Lev
 LÉVI=Lev
 LEVITIQUE=Lev
 LM=Lam
-LU=42 
+LU=Luke
 LUC=Luke
 LV=Lev
 M=Matt
 MA=Mal
-MAL=39 
+MAL=Mal
 MALA=Mal
-MAR=41 
-MAT=40 
-MATT=40 
+MAR=Mark
+MAT=Matt
+MATT=Matt
 MC=Mark
-MI=33 
-MIC=33 
-MICH=33 
+MI=Mic
+MIC=Mic
+MICH=Mic
 MICHEE=Mic
 ML=Mal
-MR=41 
+MR=Mark
 MT=Matt
 N=Num
-NA=34 
-NAH=34 
+NA=Nah
+NAH=Nah
 NAHU=Hab
 NB=Num
-NE=16 
-NÉ=16 
-NEH=16 
-NÉH=16 
+NE=Neh
+NÉ=Neh
+NEH=Neh
+NÉH=Neh
 NEHE=Neh
 NÉHE=Neh
 NEHÉ=Neh
 NÉHÉ=Neh
 NEHEMIE=Neh
-NO=4 
-NOM=4 
+NO=Num
+NOM=Num
 NOMB=Num
 O=Hos
-OS=28 
-OSE=28 
-OSÉ=28 
+OS=Hos
+OSE=Hos
+OSÉ=Hos
 OSEE=Hos
 P=Ps
-PH=50 
-PHI=50 
+PH=Phil
+PHI=Phil
 PHIL=Phil
-PHIL=57 
+PHIL=Phlm
 PHILEMON=Phlm
-PHM=57 
-PR=20 
+PHM=Phlm
+PR=Prov
 PRE=Eccl
 PRÉ=Eccl
 PRED=Eccl
 PRÉD=Eccl
 PREDICATEUR=Eccl
-PRO=20 
+PRO=Prov
 PROV=Prov
-PS=19 
-PSA=19 
+PS=Ps
+PSA=Ps
 PSAU=Ps
 QO=Eccl
 R=Rom
-RE=66 
-RÉ=66 
-REV=66 
-RÉV=66 
-REVE=66 
-RÉVE=66 
-REVÉ=66 
+RE=Rev
+RÉ=Rev
+REV=Rev
+RÉV=Rev
+REVE=Rev
+RÉVE=Rev
+REVÉ=Rev
 RÉVÉ=Rev
 RM=Rom
-RO=45 
+RO=Rom
 ROM=Rom
 RT=Ruth
-RU=8 
+RU=Ruth
 RUT=Ruth
 S=Zeph
-SO=36 
-SOP=36 
+SO=Zeph
+SOP=Zeph
 SOPH=Zeph
 T=Titus
-TI=56 
+TI=Titus
 TIT=Titus
 TT=Titus
 U=Judg
 V=Lev
 Z=Zech
-ZA=38 
-ZAC=38 
+ZA=Zech
+ZAC=Zech
 ZACH=Zech
 
 

Modified: trunk/locales.d/fr_abbrev-utf8.conf
===================================================================
--- trunk/locales.d/fr_abbrev-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/fr_abbrev-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -84,146 +84,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -231,7 +231,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/fr_abbrev.conf
===================================================================
--- trunk/locales.d/fr_abbrev.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/fr_abbrev.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -84,146 +84,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -231,7 +231,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/it-utf8.conf
===================================================================
--- trunk/locales.d/it-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/it-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/it.conf
===================================================================
--- trunk/locales.d/it.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/it.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/ja.conf
===================================================================
--- trunk/locales.d/ja.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/ja.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -83,146 +83,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -230,7 +230,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/lt-utf8.conf
===================================================================
--- trunk/locales.d/lt-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/lt-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -80,146 +80,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -227,7 +227,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/nl.conf
===================================================================
--- trunk/locales.d/nl.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/nl.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -277,15 +277,15 @@
 RICH=Judg
 RUTH=Ruth
 1SAMUEL=1Sam
-1SA=9   
-1SAM=9   
-1 SA=9   
-1 SAM=9   
+1SA=1Sam
+1SAM=1Sam
+1 SA=1Sam
+1 SAM=1Sam
 2SAMUEL=2Sam
-2SA=10  
-2SAM=10  
-2 SA=10  
-2 SAM=10  
+2SA=2Sam
+2SAM=2Sam
+2 SA=2Sam
+2 SAM=2Sam
 1KONINGEN=1Kgs
 1KO=1Kgs
 1 KO=1Kgs

Modified: trunk/locales.d/no-utf8.conf
===================================================================
--- trunk/locales.d/no-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/no-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/no.conf
===================================================================
--- trunk/locales.d/no.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/no.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/pt-utf8.conf
===================================================================
--- trunk/locales.d/pt-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/pt-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -78,146 +78,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -225,7 +225,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/pt.conf
===================================================================
--- trunk/locales.d/pt.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/pt.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -78,146 +78,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -225,7 +225,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/sk-utf8.conf
===================================================================
--- trunk/locales.d/sk-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/sk-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -85,146 +85,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -232,7 +232,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/sk.conf
===================================================================
--- trunk/locales.d/sk.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/sk.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -88,146 +88,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -235,7 +235,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/sl.conf
===================================================================
--- trunk/locales.d/sl.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/sl.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -77,146 +77,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -224,7 +224,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic
@@ -285,12 +285,12 @@
 RUT=Ruth
 1SAMUEL=1Sam
 1 SAMUEL=1Sam
-1SAM=9   
-1 SAM=9   
+1SAM=1Sam
+1 SAM=1Sam
 2SAMUEL=2Sam
 2 SAMUEL=2Sam
-2SAM=10  
-2 SAM=10  
+2SAM=2Sam
+2 SAM=2Sam
 1KRALJEV=1Kgs
 1 KRALJEV=1Kgs
 1KR=1Kgs

Modified: trunk/locales.d/sv-utf8.conf
===================================================================
--- trunk/locales.d/sv-utf8.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/sv-utf8.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -78,146 +78,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -225,7 +225,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic

Modified: trunk/locales.d/sv.conf
===================================================================
--- trunk/locales.d/sv.conf	2008-07-21 10:57:54 UTC (rev 2185)
+++ trunk/locales.d/sv.conf	2008-07-21 11:28:48 UTC (rev 2186)
@@ -76,146 +76,146 @@
 1 CORINTHIANS=1Cor
 1 JN=1John
 1 JOHN=1John
-1 KGS=11   
-1 KINGS=11   
-1 PETER=60   
-1 PTR=60   
-1 SAMUEL=9   
-1 THESSALONIANS=52   
-1 TIMOTHY=54   
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
 1C=1Cor
 1CHRONICLES=1Chr
 1CORINTHIANS=1Cor
 1JN=1John
 1JOHN=1John
 1KGS=1Kgs
-1KINGS=11   
-1PETER=60   
-1PTR=60   
-1SAMUEL=9   
-1THESSALONIANS=52   
-1TIMOTHY=54   
-2 C=47   
-2 CHRONICLES=14   
-2 CORINTHIANS=47   
+1KINGS=1Kgs
+1PETER=1Pet
+1PTR=1Pet
+1SAMUEL=1Sam
+1THESSALONIANS=1Thess
+1TIMOTHY=1Tim
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
 2 JN=2John
-2 JOHN=63   
-2 KGS=12   
-2 KINGS=12   
-2 PETER=61   
-2 PTR=61   
-2 SAMUEL=10   
-2 THESSALONIANS=53   
-2 TIMOTHY=55   
-2C=47   
-2CHRONICLES=14   
-2CORINTHIANS=47   
-2JN=63   
-2JOHN=63   
-2KGS=12 
-2KINGS=12   
-2PETER=61   
-2PTR=61   
-2SAMUEL=10   
-2THESSALONIANS=53   
-2TIMOTHY=55   
-3 JN=64   
-3 JOHN=64   
-3JN=64   
-3JOHN=64   
-ACTS=44   
-AMOS=30   
-APOCALYPSE OF ST. JOHN=66  
-C=51   
-CANTICLE OF CANTICLES=22  
-COC=22  
-COLOSSIANS=51   
-D=5  
-DANIEL=27   
-DEUTERONOMY=5   
-E=49  
-ECCLESIASTES=21   
-EPHESIANS=49   
-ESTER=17   
-ESTHER=17   
-EXODUS=2   
-EZEKIEL=26   
-EZRA=15   
-G=1  
-GALATIANS=48   
-GENESIS=1   
-H=58  
-HABAKKUK=35   
-HAGGAI=37   
-HEBREWS=58   
-HOSEA=28   
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2PETER=2Pet
+2PTR=2Pet
+2SAMUEL=2Sam
+2THESSALONIANS=2Thess
+2TIMOTHY=2Tim
+3 JN=3John
+3 JOHN=3John
+3JN=3John
+3JOHN=3John
+ACTS=Acts
+AMOS=Amos
+APOCALYPSE OF ST. JOHN=Rev
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Deut
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EPHESIANS=Eph
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZRA=Ezra
+G=Gen
+GALATIANS=Gal
+GENESIS=Gen
+H=Heb
+HABAKKUK=Hab
+HAGGAI=Hag
+HEBREWS=Heb
+HOSEA=Hos
 I C=1Cor
 I CHRONICLES=1Chr
 I CORINTHIANS=1Cor
 I JN=1John
 I JOHN=1John
 I KGS=1Kgs
-I KINGS=11   
-I PETER=60   
-I PTR=60   
-I SAMUEL=9   
-I THESSALONIANS=52   
-I TIMOTHY=54   
+I KINGS=1Kgs
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
 IC=1Cor
 ICHRONICLES=1Chr
 ICORINTHIANS=1Cor
-II C=47   
-II CHRONICLES=14   
-II CORINTHIANS=47   
-II JN=63   
-II JOHN=63   
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
 II KGS=2Kgs
-II KINGS=12   
-II PETER=61   
-II PTR=61   
-II SAMUEL=10   
-II THESSALONIANS=53   
-II TIMOTHY=55   
-IIC=47   
-IICHRONICLES=14   
-IICORINTHIANS=47   
-III JN=64   
-III JOHN=64   
-IIIJN=64   
-IIIJOHN=64   
-IIJN=63   
-IIJOHN=63   
-IIKGS=12 
-IIKINGS=12   
-IIPETER=61   
-IIPTR=61   
-IISAMUEL=10   
-IITHESSALONIANS=53   
-IITIMOTHY=55   
+II KINGS=2Kgs
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+IIIJN=3John
+IIIJOHN=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
 IJN=1John
 IJOHN=1John
 IKGS=1Kgs
-IKINGS=11   
-IPETER=60   
-IPTR=60   
-ISA=23   
-ISAIAH=23   
-ISAMUEL=9   
-ITHESSALONIANS=52   
-ITIMOTHY=54   
-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   
+IKINGS=1Kgs
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
 JUDGES=Judg
 L=Luke
 LAMENTATIONS=Lam
@@ -223,7 +223,7 @@
 LK=Luke
 LUKE=Luke
 MA=Matt
-MALACHI=39   
+MALACHI=Mal
 MARK=Mark
 MATTHEW=Matt
 MICAH=Mic