| author | zautrix <zautrix> | 2005-09-28 00:19:15 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-09-28 00:19:15 (UTC) |
| commit | e6112c5497b334d6dc38108b37963c5e803413d3 (patch) (side-by-side diff) | |
| tree | b9afccc4169ffcb3b360d79e659a4b1119f2aef4 | |
| parent | fa126dfea03b4ebed9a4eed4f2104f93abb72e22 (diff) | |
| download | kdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.zip kdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.tar.gz kdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.tar.bz2 | |
import latin1 kapi
| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 6 | ||||
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 8 |
3 files changed, 16 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index fd2da1a..f9b79ae 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -11,4 +11,7 @@ Added 15 sec delay in automatic saving when Z wake up from suspend and the autom Fix for displaying month names of an utf8 translated language (like Russian). Thanks to Tanya, Russian version of KO/Pi will be available soon. +KA/Pi: +Added for vCard import the option to import contact data in Latin1 format. + ********** VERSION 2.2.3 ************ diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index ece26d2..8dd0a52 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -814,4 +814,10 @@ { "Import all!","Importiere alle!" },
{ "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" },
+{ "Import Format","Import Format" },
+{ "Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages.","Wähle Import Format!\nDefault und Standard ist Utf8.\nLatin1 kann das richtige für\nWesteuropäische Sprachen sein." },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
{ "","" },
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 91df96d..9a8fa68 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -212,5 +212,11 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const } #endif - addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); + int ret = KMessageBox::warningYesNoCancel( 0, i18n("Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages."), i18n("Import Format"), i18n("Utf8"), i18n("Latin1") ); + if ( ret == KMessageBox::Cancel ) + return addrList; + if ( ret == KMessageBox::Yes ) + addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); + else + addrList = parseVCard( QString::fromLatin1( rawData.data() ) ); } |