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,24 +1,27 @@
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 ************
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
@@ -804,17 +804,23 @@
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
@@ -202,25 +202,31 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
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;