author | zautrix <zautrix> | 2005-09-28 00:19:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-09-28 00:19:15 (UTC) |
commit | e6112c5497b334d6dc38108b37963c5e803413d3 (patch) (unidiff) | |
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 | |||
@@ -1,44 +1,47 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.2.4 ************ | 3 | ********** VERSION 2.2.4 ************ |
4 | 4 | ||
5 | 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. | 5 | 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. |
6 | 6 | ||
7 | KO/Pi: | 7 | KO/Pi: |
8 | Added export option for all data to File->Export menu. | 8 | Added export option for all data to File->Export menu. |
9 | Better management if a save error occours. | 9 | Better management if a save error occours. |
10 | 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. | 10 | 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. |
11 | Fix for displaying month names of an utf8 translated language (like Russian). Thanks to Tanya, Russian version of KO/Pi will be available soon. | 11 | Fix for displaying month names of an utf8 translated language (like Russian). Thanks to Tanya, Russian version of KO/Pi will be available soon. |
12 | 12 | ||
13 | KA/Pi: | ||
14 | Added for vCard import the option to import contact data in Latin1 format. | ||
15 | |||
13 | ********** VERSION 2.2.3 ************ | 16 | ********** VERSION 2.2.3 ************ |
14 | 17 | ||
15 | KO/Pi: | 18 | KO/Pi: |
16 | Fixed a problem with (non empty) exception dates in the exception date edit dialog of recurring events for newly created events. | 19 | Fixed a problem with (non empty) exception dates in the exception date edit dialog of recurring events for newly created events. |
17 | 20 | ||
18 | Fixed usability problem in KA/Pi: | 21 | Fixed usability problem in KA/Pi: |
19 | Now searching works for "all phone numbers and all addresses" if "all fields" is selected as search option. | 22 | Now searching works for "all phone numbers and all addresses" if "all fields" is selected as search option. |
20 | 23 | ||
21 | Changed some behaviour in OM/Pi mail management to make it more usable. | 24 | Changed some behaviour in OM/Pi mail management to make it more usable. |
22 | 25 | ||
23 | 26 | ||
24 | ********** VERSION 2.2.2 ************ | 27 | ********** VERSION 2.2.2 ************ |
25 | 28 | ||
26 | KO/Pi: | 29 | KO/Pi: |
27 | Fixed a problem with the sort order of last modified date in list view. | 30 | Fixed a problem with the sort order of last modified date in list view. |
28 | KA/Pi: | 31 | KA/Pi: |
29 | Fixed a resource config read problem on windows. | 32 | Fixed a resource config read problem on windows. |
30 | 33 | ||
31 | 34 | ||
32 | ********** VERSION 2.2.1 ************ | 35 | ********** VERSION 2.2.1 ************ |
33 | 36 | ||
34 | KO/Pi: | 37 | KO/Pi: |
35 | Fixed a problem displaying very long allday events in agenda view in single day mode. | 38 | Fixed a problem displaying very long allday events in agenda view in single day mode. |
36 | Fixed a problem with the default settings for new todos. | 39 | Fixed a problem with the default settings for new todos. |
37 | Added an error message dialog if saving of calendar files is not possible. | 40 | Added an error message dialog if saving of calendar files is not possible. |
38 | Made it impossible to close KO/Pi if saving fails. | 41 | Made it impossible to close KO/Pi if saving fails. |
39 | Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick. | 42 | Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick. |
40 | Added config options for conflict detection. | 43 | Added config options for conflict detection. |
41 | 44 | ||
42 | KA/Pi: | 45 | KA/Pi: |
43 | Added a config option to turn on asking before a contact is deleted. | 46 | Added a config option to turn on asking before a contact is deleted. |
44 | Fixed a problem with the default view and view selection at startup. | 47 | 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 @@ | |||
784 | { "Hide!","Verbergen!" }, | 784 | { "Hide!","Verbergen!" }, |
785 | { "Show!","Anzeigen!" }, | 785 | { "Show!","Anzeigen!" }, |
786 | { "Details","Details" }, | 786 | { "Details","Details" }, |
787 | { "Search:","Suche:" }, | 787 | { "Search:","Suche:" }, |
788 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, | 788 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, |
789 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, | 789 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, |
790 | { "<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?" }, | 790 | { "<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?" }, |
791 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, | 791 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, |
792 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, | 792 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, |
793 | { "Pi-Sync Error","Pi-Sync Fehler" }, | 793 | { "Pi-Sync Error","Pi-Sync Fehler" }, |
794 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, | 794 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, |
795 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, | 795 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, |
796 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, | 796 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, |
797 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, | 797 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, |
798 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, | 798 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, |
799 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, | 799 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, |
800 | { "Receiving file from remote...","Empfange entfernte Datei..." }, | 800 | { "Receiving file from remote...","Empfange entfernte Datei..." }, |
801 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, | 801 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, |
802 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, | 802 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, |
803 | { "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" }, | 803 | { "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" }, |
804 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, | 804 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, |
805 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, | 805 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, |
806 | { "Writing back file ...","Schreibe Datei zurück..." }, | 806 | { "Writing back file ...","Schreibe Datei zurück..." }, |
807 | { "Sending back file ...","Sende Datei zurück..." }, | 807 | { "Sending back file ...","Sende Datei zurück..." }, |
808 | { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" }, | 808 | { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" }, |
809 | { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" }, | 809 | { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" }, |
810 | { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" }, | 810 | { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" }, |
811 | { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" }, | 811 | { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" }, |
812 | { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." }, | 812 | { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." }, |
813 | { "Import this contact?","Importiere diesen Kontakt?" }, | 813 | { "Import this contact?","Importiere diesen Kontakt?" }, |
814 | { "Import all!","Importiere alle!" }, | 814 | { "Import all!","Importiere alle!" }, |
815 | { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" }, | 815 | { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" }, |
816 | { "Import Format","Import Format" }, | ||
817 | { "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." }, | ||
818 | { "","" }, | ||
819 | { "","" }, | ||
820 | { "","" }, | ||
821 | { "","" }, | ||
816 | { "","" }, | 822 | { "","" }, |
817 | { "","" }, | 823 | { "","" }, |
818 | { "","" }, | 824 | { "","" }, |
819 | { "","" }, | 825 | { "","" }, |
820 | { "","" }, \ No newline at end of file | 826 | { "","" }, \ 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 | |||
182 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); | 182 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); |
183 | 183 | ||
184 | if ( fileName.isEmpty() ) | 184 | if ( fileName.isEmpty() ) |
185 | return addrList; | 185 | return addrList; |
186 | QFileInfo fi ( fileName ); | 186 | QFileInfo fi ( fileName ); |
187 | if ( !fi.isFile() ) | 187 | if ( !fi.isFile() ) |
188 | return addrList; | 188 | return addrList; |
189 | } | 189 | } |
190 | else | 190 | else |
191 | { | 191 | { |
192 | //US url = XXPortManager::importURL; | 192 | //US url = XXPortManager::importURL; |
193 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); | 193 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); |
194 | if ( url.isEmpty() ) | 194 | if ( url.isEmpty() ) |
195 | return addrList; | 195 | return addrList; |
196 | 196 | ||
197 | } | 197 | } |
198 | QFile file( fileName ); | 198 | QFile file( fileName ); |
199 | if ( file.open( IO_ReadOnly ) ) { | 199 | if ( file.open( IO_ReadOnly ) ) { |
200 | QCString rawData ( file.readAll().data(),file.size()+1); | 200 | QCString rawData ( file.readAll().data(),file.size()+1); |
201 | file.close(); | 201 | file.close(); |
202 | int start = 0; | 202 | int start = 0; |
203 | #ifndef DESKTOP_VERSION | 203 | #ifndef DESKTOP_VERSION |
204 | while ( start < rawData.size()-2 ) { | 204 | while ( start < rawData.size()-2 ) { |
205 | if ( rawData.at( start ) == '\r' ) | 205 | if ( rawData.at( start ) == '\r' ) |
206 | if ( rawData.at( start+1 ) == '\n' ) | 206 | if ( rawData.at( start+1 ) == '\n' ) |
207 | if ( rawData.at( start+2 ) == ' ' ) { | 207 | if ( rawData.at( start+2 ) == ' ' ) { |
208 | rawData.remove(start,3); | 208 | rawData.remove(start,3); |
209 | --start; | 209 | --start; |
210 | } | 210 | } |
211 | ++start; | 211 | ++start; |
212 | } | 212 | } |
213 | #endif | 213 | #endif |
214 | addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); | 214 | 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") ); |
215 | if ( ret == KMessageBox::Cancel ) | ||
216 | return addrList; | ||
217 | if ( ret == KMessageBox::Yes ) | ||
218 | addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); | ||
219 | else | ||
220 | addrList = parseVCard( QString::fromLatin1( rawData.data() ) ); | ||
215 | } | 221 | } |
216 | 222 | ||
217 | } | 223 | } |
218 | #endif //KAB_EMBEDDED | 224 | #endif //KAB_EMBEDDED |
219 | 225 | ||
220 | return addrList; | 226 | return addrList; |
221 | } | 227 | } |
222 | 228 | ||
223 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const | 229 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const |
224 | { | 230 | { |
225 | 231 | ||
226 | KABC::VCardTool tool; | 232 | KABC::VCardTool tool; |
227 | KABC::AddresseeList addrList; | 233 | KABC::AddresseeList addrList; |
228 | addrList = tool.parseVCards( data ); | 234 | addrList = tool.parseVCards( data ); |
229 | // LR : I switched to the code, which is in current cvs HEAD | 235 | // LR : I switched to the code, which is in current cvs HEAD |
230 | /* | 236 | /* |
231 | uint numVCards = data.contains( "BEGIN:VCARD", false ); | 237 | uint numVCards = data.contains( "BEGIN:VCARD", false ); |
232 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); | 238 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); |
233 | 239 | ||
234 | for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { | 240 | for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { |
235 | KABC::Addressee addr; | 241 | KABC::Addressee addr; |
236 | bool ok = false; | 242 | bool ok = false; |
237 | 243 | ||
238 | if ( dataList[ i ].contains( "VERSION:3.0" ) ) | 244 | if ( dataList[ i ].contains( "VERSION:3.0" ) ) |
239 | ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 ); | 245 | ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 ); |
240 | else if ( dataList[ i ].contains( "VERSION:2.1" ) ) | 246 | else if ( dataList[ i ].contains( "VERSION:2.1" ) ) |
241 | ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 ); | 247 | ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 ); |
242 | else { | 248 | else { |
243 | KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) ); | 249 | KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) ); |
244 | continue; | 250 | continue; |
245 | } | 251 | } |
246 | 252 | ||