import latin1 kapi

3 files changed, 15 insertions, 0 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
@@ -1,44 +1,47 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.2.4 ************
 
 KO/Pi alarm applet: Made font smaller and added a dealy before starting KO/Pi to avoid problems accessing data storage when an alarm did wake up the Z.
 
 KO/Pi: 
 Added export option for all data to File->Export menu.
 Better management if a save error occours.
 Added 15 sec delay in automatic saving when Z wake up from suspend and the automatic save timer did expire -  to avoid problems accessing data storage directly after wake up.
 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 ************
 
 KO/Pi:
 Fixed a problem with (non empty) exception dates in the exception date edit dialog of recurring events for newly created events.
 
 Fixed usability problem in KA/Pi:
 Now searching works for "all phone numbers and all addresses" if "all fields" is selected as search option. 
 
 Changed some behaviour in OM/Pi mail management to make it more usable.
 
 
 ********** VERSION 2.2.2 ************
 
 KO/Pi:
 Fixed a problem with the sort order of last modified date in list view. 
 KA/Pi:
 Fixed a resource config read problem on windows. 
 
 
 ********** VERSION 2.2.1 ************
 
 KO/Pi:
 Fixed a problem displaying very long allday events in agenda view in single day mode.
 Fixed a problem with the default settings for new todos.
 Added an error message dialog if saving of calendar files is not possible.
 Made it impossible to close KO/Pi if saving fails.
 Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick.
 Added config options for conflict detection.
 
 KA/Pi:
 Added a config option to turn on asking before a contact is deleted.
 Fixed a problem with the default view and view selection at startup.
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
@@ -784,37 +784,43 @@
 { "Hide!","Verbergen!" },

 { "Show!","Anzeigen!" },

 { "Details","Details" },

 { "Search:","Suche:" },

 { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" },

 { "Pi-Sync Port Error","Pi-Sync Port Fehler" },

 { "<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?","<b>Anschalten von Pi-Sync fehlgeschlagen!</b> Fehler beim Ansprechen des Ports %1! Ist bereits eine andere Anwendung dabei diesen Port zu nutzen?" },

 { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" },

 { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" },

 { "Pi-Sync Error","Pi-Sync Fehler" },

 { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" },

 { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" },

 { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." },

 { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" },

 { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" },

 { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" },

 { "Receiving file from remote...","Empfange entfernte Datei..." },

 { "Sending back synced file...","Sende synchronisierte Datei zurück..." },

 { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" },

 { "Do you want to\nclear the sync\ninfo of profile\n%1?\n","Möchten Sie wirklich\ndie Sync-Info für Profil\n%1?\nlöschen" },

 { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." },

 { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" },

 { "Writing back file ...","Schreibe Datei zurück..." },

 { "Sending back file ...","Sende Datei zurück..." },

 { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" },

 { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },

 { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" },

 { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" },

 { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." },

 { "Import this contact?","Importiere diesen Kontakt?" },

 { "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." },

+{ "","" },

+{ "","" },

+{ "","" },

+{ "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },
\ No newline at end of file
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
@@ -182,65 +182,71 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
                 fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
 
                 if ( fileName.isEmpty() )
                     return addrList;
                 QFileInfo fi ( fileName );
                 if ( !fi.isFile() )
                     return addrList;
             }
         else
             {
                 //US      url = XXPortManager::importURL;
                 qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
                 if ( url.isEmpty() )
                     return addrList;
 
             }
         QFile file( fileName );
         if ( file.open( IO_ReadOnly ) ) {
             QCString rawData ( file.readAll().data(),file.size()+1);
             file.close();
             int start = 0;
 #ifndef DESKTOP_VERSION            
             while ( start < rawData.size()-2 ) {
                 if ( rawData.at( start ) == '\r' ) 
                     if ( rawData.at( start+1 ) == '\n' )
                         if ( rawData.at( start+2 ) == ' ' ) {
                             rawData.remove(start,3);
                             --start;
                         }
                 ++start;
             }
 #endif
+            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() ) );
         }
 
     }
 #endif //KAB_EMBEDDED
 
     return addrList;
 }
 
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
 {
 
     KABC::VCardTool tool;
     KABC::AddresseeList addrList;
     addrList = tool.parseVCards( data );
     // LR : I switched to the code, which is in current cvs HEAD
     /*
       uint numVCards = data.contains( "BEGIN:VCARD", false );
       QStringList dataList = QStringList::split( "\r\n\r\n", data );
 
       for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
       KABC::Addressee addr;
       bool ok = false;
 
       if ( dataList[ i ].contains( "VERSION:3.0" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 );
       else if ( dataList[ i ].contains( "VERSION:2.1" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 );
       else {
       KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) );
       continue;
       }