Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 348 insertions, 0 deletions

diff --git a/kaddressbook/csv-templates/Makefile.am b/kaddressbook/csv-templates/Makefile.am
new file mode 100644
index 000000000..e92e5d2c2
--- /dev/null
+++ b/kaddressbook/csv-templates/Makefile.am
@@ -0,0 +1,2 @@
+templatedir = $(kde_datadir)/kaddressbook/csv-templates
+template_DATA = kaddressbook.desktop outlook2000.desktop yahoo.desktop
diff --git a/kaddressbook/csv-templates/README b/kaddressbook/csv-templates/README
new file mode 100644
index 000000000..befe2ab4c
--- /dev/null
+++ b/kaddressbook/csv-templates/README
@@ -0,0 +1,49 @@
+Here are listed all fields kaddressbook can import via csv. If you want
+to create a new csv import template, you have to create a file like
+'kaddressbook.desktop', but with the correct column mapping.
+
+---
+
+00 "Formatted Name"
+01 "Family Name"
+02 "Given Name"
+03 "Additional Names"
+04 "Honorific Prefixes"
+05 "Honorific Suffixes"
+06 "Nick Name"
+07 "Birthday"
+08 "Home Address Street"
+09 "Home Address Locality"
+10 "Home Address Region"
+11 "Home Address Postal Code"
+12 "Home Address Country"
+13 "Home Address Label"
+14 "Business Address Street"
+15 "Business Address Locality"
+16 "Business Address Region"
+17 "Business Address Postal Code"
+18 "Business Address Country"
+19 "Business Address Label"
+20 "Home Phone"
+21 "Business Phone"
+22 "Mobile Phone"
+23 "Home Fax"
+24 "Business Fax"
+25 "Car Phone"
+26 "Isdn"
+27 "Pager"
+28 "Email Address"
+29 "Mail Client"
+30 "Title"
+31 "Role"
+32 "Organization"
+33 "Note"
+34 "URL"
+35 "Department"
+36 "Profession"
+37 "Assistant's Name"
+38 "Manager's Name"
+39 "Partner's Name"
+40 "Office"
+41 "IM Address"
+42 "Anniversary"
diff --git a/kaddressbook/csv-templates/kaddressbook.desktop b/kaddressbook/csv-templates/kaddressbook.desktop
new file mode 100644
index 000000000..a5b9c4066
--- /dev/null
+++ b/kaddressbook/csv-templates/kaddressbook.desktop
@@ -0,0 +1,83 @@
+[General]
+Columns=43
+DatePattern=Y-M-D
+DelimiterOther=
+DelimiterType=0
+QuoteType=0
+
+[Misc]
+Name=KAddressBook (KDE 3.1)
+Name[af]=K-adresboek (Kde 3.1)
+Name[ar]=دفتر العناوين KAddressBook (KDE 3.1(
+Name[ca]=Llibreta d'adreces (KDE 3.1)
+Name[cs]=Kniha adres (KDE 3.1)
+Name[cy]=KLlyfrCyfeiriadau (KDE 3.1)
+Name[de]=Adressbuch (KDE 3.1)
+Name[et]=KDE aadressiraamat (KDE 3.1)
+Name[fo]=KAdressubók (KDE 3.1)
+Name[hi]=केडीईएड्रेसबुक (केडीई 3.1)
+Name[hr]=KAdressBook (KDE 3.1)
+Name[hu]=Címjegyzék (KDE 3.1)
+Name[it]=Rubrica indirizzi (KDE 3.1)
+Name[ka]=წიგნაკი (KDE 3.1)
+Name[mk]=КАдресар (KDE 3.1)
+Name[nb]=Adressebok (KDE 3.1)
+Name[nds]=KAdressbook (KDE 3.1)
+Name[ne]=केडीई ठेगाना पुस्तिका (केडीई ३.१)
+Name[nn]=KDE-adressebok (KDE 3.1)
+Name[nso]=KBuka ya Diaterese (KDE 3.1)
+Name[pl]=Książka adresowa (KDE 3.1)
+Name[ro]=Cartea de adrese (KDE 3.1)
+Name[ru]=Адресная книга (KDE 3.1)
+Name[se]=KDE-čujuhusgirji (KDE 3.3)
+Name[sl]=Adresar (KDE 3.1)
+Name[sv]=Kadressbok (KDE 3.1)
+Name[ta]=கேமுகவரிப்புத்தகம் (KDE 3.1)
+Name[tg]=Китоби адрес (KDE 3.1)
+Name[tr]=KDE Adres Defteri (KDE 3.1)
+Name[ven]=Bugu ya diresi ya K (KDE 3.1)
+
+[csv column map]
+0=1
+1=2
+10=11
+11=12
+12=13
+13=14
+14=15
+15=16
+16=17
+17=18
+18=19
+19=20
+2=3
+20=21
+21=22
+22=23
+23=24
+24=25
+25=26
+26=27
+27=28
+28=29
+29=30
+3=4
+30=31
+31=32
+32=33
+33=34
+34=35
+35=36
+36=37
+37=38
+38=39
+39=40
+4=5
+40=41
+41=42
+42=43
+5=6
+6=7
+7=8
+8=9
+9=10
diff --git a/kaddressbook/csv-templates/outlook2000.desktop b/kaddressbook/csv-templates/outlook2000.desktop
new file mode 100644
index 000000000..d5c6a4b28
--- /dev/null
+++ b/kaddressbook/csv-templates/outlook2000.desktop
@@ -0,0 +1,109 @@
+[General]
+Columns=92
+DelimiterOther=
+DelimiterType=0
+QuoteType=0
+
+[Misc]
+Name=Outlook 2000
+Name[ar]=برنامج Outlook 2000
+Name[eo]=Redmondo 2000
+Name[fa]=اوت لوک ۲۰۰۰
+Name[hi]=आउटलुक 2000
+Name[ne]=आउटलुक २०००
+Name[nso]=Bokantle 2000
+Name[ta]=அவுட்லுக் 2000
+
+[csv column map]
+0=5
+1=3
+10=0
+11=16
+12=17
+13=18
+14=19
+15=9
+16=0
+17=0
+18=10
+19=11
+2=4
+20=12
+21=13
+22=0
+23=0
+24=0
+25=0
+26=0
+27=0
+28=0
+29=0
+3=2
+30=25
+31=22
+32=0
+33=0
+34=26
+35=0
+36=24
+37=21
+38=0
+39=27
+4=6
+40=23
+41=0
+42=0
+43=28
+44=0
+45=0
+46=0
+47=0
+48=0
+49=43
+5=33
+50=38
+51=0
+52=8
+53=0
+54=0
+55=0
+56=0
+57=29
+58=0
+59=1
+6=36
+60=0
+61=0
+62=0
+63=0
+64=0
+65=0
+66=0
+67=0
+68=0
+69=0
+7=31
+70=0
+71=0
+72=0
+73=0
+74=0
+75=39
+76=0
+77=34
+78=0
+79=0
+8=15
+80=0
+81=0
+82=0
+83=37
+84=0
+85=0
+86=40
+87=0
+88=0
+89=0
+9=0
+90=0
+91=35
diff --git a/kaddressbook/csv-templates/yahoo.desktop b/kaddressbook/csv-templates/yahoo.desktop
new file mode 100644
index 000000000..b365365c8
--- /dev/null
+++ b/kaddressbook/csv-templates/yahoo.desktop
@@ -0,0 +1,105 @@
+[General]
+Columns=39
+DatePattern=M/D/Y
+DelimiterOther=
+DelimiterType=0
+QuoteType=0
+
+[Misc]
+Name=Yahoo! AddressBook
+Name[af]=Yahoo! Adresboek
+Name[ar]=دفتر العناوين Yahoo!
+Name[be]=Адрасная кніга Yahoo!
+Name[br]=Karned chomlec'hioù Yahoo !
+Name[bs]=Yahoo! Adresar
+Name[ca]=Llibreta d'adreces Yahoo!
+Name[cs]=Kniha adres Yahoo!
+Name[cy]=Llyfr Cyfeiriadau Yahoo!
+Name[da]=Yahoo! adressebog
+Name[de]=Yahoo!-Adressbuch
+Name[el]=Βιβλίο διευθύνσεων Yahoo!
+Name[eo]=Yahoo! Adresaro
+Name[es]=Libreta de direcciones de Yahoo!
+Name[et]=Yahoo! aadressiraamat
+Name[eu]=Yahoo! helbide-liburua
+Name[fa]=کتاب نشانی یاهو!
+Name[fi]=Yahoo-osoitekirja
+Name[fr]=Carnet d'adresses Yahoo!
+Name[fy]=Yahoo!-adresboek
+Name[he]=פנקס כתובת של Yahoo!
+Name[hi]=याहू! पता पुस्तिका
+Name[hu]=Yahoo! címjegyzék
+Name[is]=Yahoo! póstfangaskrá
+Name[it]=Rubrica indirizzi Yahoo!
+Name[ja]=Yahoo! アドレス帳
+Name[ka]=წიგნაკი Yahoo!
+Name[kk]=Yahoo! адрестік кітапшасы
+Name[km]=សៀវភៅ​អាសយដ្ឋាន​របស់​យ៉ាហ៊ូ
+Name[ko]=Yahoo! 주소록
+Name[lt]=Yahoo! Adresų knygutė
+Name[mk]=Адресар од Yahoo!
+Name[nb]=Yahoo! adressebok
+Name[nds]=Yahoo!-Adressbook
+Name[ne]=याहू! ठेगाना पुस्तिका
+Name[nl]=Yahoo!-adresboek
+Name[nn]=Yahoo! Adressebok
+Name[pa]=Yahoo! ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ
+Name[pl]=Książka adresowa Yahoo!
+Name[pt]=Livro de Endereços do Yahoo!
+Name[pt_BR]=Livro de Endereços do Yahoo!
+Name[ru]=Адресная книга Yahoo!
+Name[se]=Yahoo! čujuhusgirji
+Name[sk]=Yahoo! kniha adries
+Name[sl]=Adresar Yahoo!
+Name[sr]=Yahoo! адресар
+Name[sr@Latn]=Yahoo! adresar
+Name[sv]=Yahoo!-adressbok
+Name[ta]=யாஹூ! முகவரிப் புத்தகம்
+Name[tg]=Китоби адресии Yahoo!
+Name[tr]=Yahoo! Adres Defteri
+Name[uk]=Адресна книга Yahoo
+Name[uz]=Yahoo! manzillar daftari
+Name[uz@cyrillic]=Yahoo! манзиллар дафтари
+Name[zh_CN]=Yahoo! 地址簿
+Name[zh_TW]=Yahoo! 通訊錄
+
+[csv column map]
+0=3
+1=4
+10=28
+11=24
+12=23
+13=0
+14=0
+15=0
+16=0
+17=0
+18=35
+19=0
+2=2
+20=31
+21=33
+22=15
+23=16
+24=17
+25=18
+26=19
+27=9
+28=10
+29=11
+3=7
+30=12
+31=13
+32=8
+33=43
+34=0
+35=0
+36=0
+37=0
+38=34
+4=29
+5=0
+6=0
+7=0
+8=21
+9=22