summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-09-28 00:19:15 (UTC)
committer zautrix <zautrix>2005-09-28 00:19:15 (UTC)
commite6112c5497b334d6dc38108b37963c5e803413d3 (patch) (unidiff)
treeb9afccc4169ffcb3b360d79e659a4b1119f2aef4
parentfa126dfea03b4ebed9a4eed4f2104f93abb72e22 (diff)
downloadkdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.zip
kdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.tar.gz
kdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.tar.bz2
import latin1 kapi
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt6
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp8
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,60 +1,63 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.2.4 ************ 3********** VERSION 2.2.4 ************
4 4
5KO/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. 5KO/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
7KO/Pi: 7KO/Pi:
8Added export option for all data to File->Export menu. 8Added export option for all data to File->Export menu.
9Better management if a save error occours. 9Better management if a save error occours.
10Added 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. 10Added 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.
11Fix for displaying month names of an utf8 translated language (like Russian). Thanks to Tanya, Russian version of KO/Pi will be available soon. 11Fix 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
13KA/Pi:
14Added 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
15KO/Pi: 18KO/Pi:
16Fixed a problem with (non empty) exception dates in the exception date edit dialog of recurring events for newly created events. 19Fixed a problem with (non empty) exception dates in the exception date edit dialog of recurring events for newly created events.
17 20
18Fixed usability problem in KA/Pi: 21Fixed usability problem in KA/Pi:
19Now searching works for "all phone numbers and all addresses" if "all fields" is selected as search option. 22Now searching works for "all phone numbers and all addresses" if "all fields" is selected as search option.
20 23
21Changed some behaviour in OM/Pi mail management to make it more usable. 24Changed 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
26KO/Pi: 29KO/Pi:
27Fixed a problem with the sort order of last modified date in list view. 30Fixed a problem with the sort order of last modified date in list view.
28KA/Pi: 31KA/Pi:
29Fixed a resource config read problem on windows. 32Fixed a resource config read problem on windows.
30 33
31 34
32********** VERSION 2.2.1 ************ 35********** VERSION 2.2.1 ************
33 36
34KO/Pi: 37KO/Pi:
35Fixed a problem displaying very long allday events in agenda view in single day mode. 38Fixed a problem displaying very long allday events in agenda view in single day mode.
36Fixed a problem with the default settings for new todos. 39Fixed a problem with the default settings for new todos.
37Added an error message dialog if saving of calendar files is not possible. 40Added an error message dialog if saving of calendar files is not possible.
38Made it impossible to close KO/Pi if saving fails. 41Made it impossible to close KO/Pi if saving fails.
39Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick. 42Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick.
40Added config options for conflict detection. 43Added config options for conflict detection.
41 44
42KA/Pi: 45KA/Pi:
43Added a config option to turn on asking before a contact is deleted. 46Added a config option to turn on asking before a contact is deleted.
44Fixed a problem with the default view and view selection at startup. 47Fixed a problem with the default view and view selection at startup.
45Formatted name is now set on import, if formatted name is empty. 48Formatted name is now set on import, if formatted name is empty.
46Fixed a problem of displaying images in the contact details view: 49Fixed a problem of displaying images in the contact details view:
47Now the wid/hei ratio is not changed. 50Now the wid/hei ratio is not changed.
48I a picture is larger than 128 pixels in wid or hei it is downscaled to 51I a picture is larger than 128 pixels in wid or hei it is downscaled to
49max 128 pixels wid/hei. 52max 128 pixels wid/hei.
50 53
51********** VERSION 2.2.0 ************ 54********** VERSION 2.2.0 ************
52 55
53New stable release! 56New stable release!
54Fixed some minor usability problems. 57Fixed some minor usability problems.
55Added writing of next alarm to a file for usage on pdaXrom. 58Added writing of next alarm to a file for usage on pdaXrom.
56 59
57 60
58************************************* 61*************************************
59 62
60You can find the complete changelog 63You can find the complete changelog
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
@@ -768,53 +768,59 @@
768{ "Try again later","Versuche später nochmal" }, 768{ "Try again later","Versuche später nochmal" },
769{ "Try again tomorrow","Versuche morgen nochmal" }, 769{ "Try again tomorrow","Versuche morgen nochmal" },
770{ "Disable backup","Schalte Backup ab" }, 770{ "Disable backup","Schalte Backup ab" },
771{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, 771{ "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },
772{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, 772{ "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
773{ "Choose action","Wähle Aktion" }, 773{ "Choose action","Wähle Aktion" },
774{ "&Configure KA/Pi...","Konfiguriere KA/Pi..." }, 774{ "&Configure KA/Pi...","Konfiguriere KA/Pi..." },
775{ "Global Settings...","Globale Einstellungen..." }, 775{ "Global Settings...","Globale Einstellungen..." },
776{ "Spouse","Ehegatte" }, 776{ "Spouse","Ehegatte" },
777{ "Notes","Notizen" }, 777{ "Notes","Notizen" },
778{ "Messanger","Messanger" }, 778{ "Messanger","Messanger" },
779{ "Assistant","Assistent" }, 779{ "Assistant","Assistent" },
780{ "Manager","Manager" }, 780{ "Manager","Manager" },
781{ "Secrecy","Sichtbar" }, 781{ "Secrecy","Sichtbar" },
782{ "male","männlich" }, 782{ "male","männlich" },
783{ "female","weiblich" }, 783{ "female","weiblich" },
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
@@ -166,97 +166,103 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
166 } else { 166 } else {
167 QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ); 167 QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" );
168 KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); 168 KMessageBox::error( parentWidget(), text.arg( url.url() ), caption );
169 } 169 }
170 170
171 } 171 }
172 172
173 173
174#else //KAB_EMBEDDED 174#else //KAB_EMBEDDED
175 175
176 176
177 if ( !XXPortManager::importData.isEmpty() ) 177 if ( !XXPortManager::importData.isEmpty() )
178 addrList = parseVCard( XXPortManager::importData ); 178 addrList = parseVCard( XXPortManager::importData );
179 else { 179 else {
180 if ( XXPortManager::importURL.isEmpty() ) 180 if ( XXPortManager::importURL.isEmpty() )
181 { 181 {
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
223KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const 229KABC::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
247 if ( !addr.isEmpty() && ok ) 253 if ( !addr.isEmpty() && ok )
248 addrList.append( addr ); 254 addrList.append( addr );
249 else { 255 else {
250 QString text = i18n( "The selected file does not include a valid vCard. " 256 QString text = i18n( "The selected file does not include a valid vCard. "
251 "Please check the file and try again." ); 257 "Please check the file and try again." );
252 KMessageBox::sorry( parentWidget(), text ); 258 KMessageBox::sorry( parentWidget(), text );
253 } 259 }
254 } 260 }
255 */ 261 */
256 if ( addrList.isEmpty() ) { 262 if ( addrList.isEmpty() ) {
257 QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" ); 263 QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" );
258 KMessageBox::sorry( parentWidget(), text ); 264 KMessageBox::sorry( parentWidget(), text );
259 } 265 }
260 return addrList; 266 return addrList;
261} 267}
262 268