| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 8 | ||||
| -rw-r--r-- | bin/kdepim/kaddressbook/usertranslation.txt | 8 | ||||
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 305 | ||||
| -rw-r--r-- | microkde/kdecore/klocale.cpp | 2 |
4 files changed, 165 insertions, 158 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 7a63eed..2f449ef 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -608,103 +608,107 @@ { "Reverse: Bond, James","Umgekehrt: Bond, James" },
{ "Organization: MI6","Organisation: MI6" },
{ "Set formatted name to\norganization, if name empty","Setze formatierten Namen auf\nOrganisation, wenn Name leer ist." },
{ "Select contact list","Selektiere Kontakt Liste" },
{ "Changing contact #%1","Ändere Kontakt #%1" },
{ "Refreshing view...","Lade Ansicht neu..." },
{ "Setting formatted name completed!","Setzen vom formatierten Namen beendet!" },
{ "Removing voice...","Entferne voice..." },
{ "Remove voice completed!","Entferne voice beendet!" },
{ "Merge with existing categories?","Zu bestehenden Kategorien hinzufügen?" },
{ "Setting categories ... please wait!","Setze Kategorien ... bitte warten!" },
{ "Setting categories completed!","Setzen der Kategorien beendet!" },
{ "OK","OK" },
{ "Please wait, processing categories...","Bitte warten, bearbeite Kategorien..." },
{ "Processing contact #%1","Bearbeite Kontakt #%1" },
{ " categories added to list! "," Kategorien zur Liste hinzugefügt! " },
{ "%1: %2","%1: %2" },
{ "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n","Ihr persönlicher Kontakt ist\nnicht gesetzt! Bitte selektieren Sie\nihn und setzen ihn mit Menu:\nKonfiguration - Setze wer bin ich\n" },
{ "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>","<qt>Wollen Sie wirklich<br><b>%1</b><br>als persönlichen Kontakt setzent?</qt>" },
{ "Cut","Ausschneiden" },
{ "Paste","Einfügen" },
{ "Delete","Löschen" },
{ "Choose...","Wähle..." },
{ "Add View","Ansicht hinzufügen" },
{ "View name:","Ansicht Name:" },
{ "View Type","Ainsicht Typ" },
{ "Icons represent contacts. Very simple view.","Icons repräsentieren Kontakte. Sehr einfache Ansicht." },
{ "A listing of contacts in a table. Each cell of the table holds a field of the contact.","Eine Kontaktliste in einer Tabelle." },
{ "Rolodex style cards represent contacts.","Rolodex Stil Karten repräsentieren Kontakte." },
{ "Draw &separators","Zeichne &Trennlinie" },
{ "Separator &width:","Trennlinien &Breite:" },
{ "&Padding:","Füllung:" },
{ "Cards","Karten" },
{ "&Margin:","&Rand:" },
{ "Draw &borders","Zeichne Ränder" },
{ "The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, incrementing the item margin will add space between the focus rectangle and the item data.","The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, incrementing the item margin will add space between the focus rectangle and the item data." },
{ "The Item Spacing decides the distance (in pixels) between the items and anything else: the view borders, other items or column separators.","The Item Spacing decides the distance (in pixels) between the items and anything else: the view borders, other items or column separators." },
{ "Sets the width of column separators","Sets the width of column separators" },
{ "&Layout","&Layout" },
{ "Show &empty fields","Zeige leere Felder" },
{ "Show field &labels","Zeige Feld Label" },
{ "Be&havior","Ver&halten" },
{ "Header, Border and Separator Color","Kopf, Rand und Trennlinien Farbe" },
{ "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>","<qt>Sind Sie sicher, dass Sie die Ansicht <b>%1</b> löschen möchten?</qt>" },
{ "Confirm Delete","Bestätige Löschen" },
{ "Edit Address Book Filter","Editiere Adressbuch Filter" },
{ "Category rule","Kategorie Regel" },
{ "Include categories","Schließe Kategorien ein" },
{ "Exclude categories","Schließe Kategorien aus" },
{ "Include contacts, that are:","Schließe folgende Kontakte ein:" },
{ "public","Öffentlich" },
{ "private","Privat" },
{ "confidential","Vertraulich" },
{ "Configure Resources","Konfiguriere Resourcen" },
{ "Resource Configuration","Resource Konfiguration" },
{ "Resources","Resourcen" },
{ "Standard","Standard" },
{ "&Use as Standard","Setze als Standard" },
{ "Select type of the new resource:","Selektiere Typ der neuen Resource:" },
{ "General Settings","Allgemeine Einstellungen" },
{ "Read-only","Nur-Lesen" },
{ "Include in sync","Schließe in Sync mit ein" },
{ "%1 Resource Settings","%1 Resource Einstellungen" },
{ "Format:","Format:" },
{ "Location:","Ort:" },
{ "Full Menu bar (restart)","Volle Menu Leiste (Neustart!)" },
{ "Language","Sprache" },
{ "Time Format","Zeit Format" },
{ "Time Zone","Zeit Zone" },
{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
{ "Save settings","Speichere Einstellungen" },
{ "Save standard","Speichere Standard" },
{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
{ "Data storage path","Daten Speicherpfad" },
{ "Multiple Sync options","Multi Sync Optionen" },
{ "Sync algo options","Sync Ablauf Optionen" },
{ "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
{ "Incoming calendar filter:","Eingehender Kalender Filter:" },
{ "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
{ "Write back options","Optionen zum Zurückschreiben" },
{ "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
{ "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
{ "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
{ "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
{ "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
{ "Time period","Zeitspanne" },
{ "From ","Von " },
{ " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
{ " weeks in the future "," Wochen in der Zukunft " },
{ "Profile kind specific settings","Profil Art abhängige Einstellungen" },
{ "Local temp file:","Lokale temp Datei:" },
{ "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
{ "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
-{ "","" },
-{ "","" },
+{ "You cannot remove your standard resource!\n Please select a new standard resource first.","Standard Resource kann\nnicht entfernt werden!\nBitte eine andere Resource\nals Standard setzen." },
+{ "Sorry","Tut mir leid" },
+{ "You cannot use a read-only<br> resource as standard!","Man kann nicht eine read-only<br> Resource als Standard setzen!" },
+{ "Please restart to get the \nchanged resources (re)loaded!\n","Bitte starten Sie jetzt\ndas Programm neu, um die geänderten\nResourcen neu zu laden!\n" },
+{ "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n","Die gewählte Datei enthält\nkeine gültige vCard.\nBitte prüfen Sie die Datei\nund versuchen es erneut.\n" },
+{ "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
\ No newline at end of file diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt index 7a63eed..4c7a93c 100644 --- a/bin/kdepim/kaddressbook/usertranslation.txt +++ b/bin/kdepim/kaddressbook/usertranslation.txt @@ -608,103 +608,107 @@ { "Reverse: Bond, James","Umgekehrt: Bond, James" },
{ "Organization: MI6","Organisation: MI6" },
{ "Set formatted name to\norganization, if name empty","Setze formatierten Namen auf\nOrganisation, wenn Name leer ist." },
{ "Select contact list","Selektiere Kontakt Liste" },
{ "Changing contact #%1","Ändere Kontakt #%1" },
{ "Refreshing view...","Lade Ansicht neu..." },
{ "Setting formatted name completed!","Setzen vom formatierten Namen beendet!" },
{ "Removing voice...","Entferne voice..." },
{ "Remove voice completed!","Entferne voice beendet!" },
{ "Merge with existing categories?","Zu bestehenden Kategorien hinzufügen?" },
{ "Setting categories ... please wait!","Setze Kategorien ... bitte warten!" },
{ "Setting categories completed!","Setzen der Kategorien beendet!" },
{ "OK","OK" },
{ "Please wait, processing categories...","Bitte warten, bearbeite Kategorien..." },
{ "Processing contact #%1","Bearbeite Kontakt #%1" },
{ " categories added to list! "," Kategorien zur Liste hinzugefügt! " },
{ "%1: %2","%1: %2" },
{ "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n","Ihr persönlicher Kontakt ist\nnicht gesetzt! Bitte selektieren Sie\nihn und setzen ihn mit Menu:\nKonfiguration - Setze wer bin ich\n" },
{ "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>","<qt>Wollen Sie wirklich<br><b>%1</b><br>als persönlichen Kontakt setzent?</qt>" },
{ "Cut","Ausschneiden" },
{ "Paste","Einfügen" },
{ "Delete","Löschen" },
{ "Choose...","Wähle..." },
{ "Add View","Ansicht hinzufügen" },
{ "View name:","Ansicht Name:" },
{ "View Type","Ainsicht Typ" },
{ "Icons represent contacts. Very simple view.","Icons repräsentieren Kontakte. Sehr einfache Ansicht." },
{ "A listing of contacts in a table. Each cell of the table holds a field of the contact.","Eine Kontaktliste in einer Tabelle." },
{ "Rolodex style cards represent contacts.","Rolodex Stil Karten repräsentieren Kontakte." },
{ "Draw &separators","Zeichne &Trennlinie" },
{ "Separator &width:","Trennlinien &Breite:" },
{ "&Padding:","Füllung:" },
{ "Cards","Karten" },
{ "&Margin:","&Rand:" },
{ "Draw &borders","Zeichne Ränder" },
{ "The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, incrementing the item margin will add space between the focus rectangle and the item data.","The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, incrementing the item margin will add space between the focus rectangle and the item data." },
{ "The Item Spacing decides the distance (in pixels) between the items and anything else: the view borders, other items or column separators.","The Item Spacing decides the distance (in pixels) between the items and anything else: the view borders, other items or column separators." },
{ "Sets the width of column separators","Sets the width of column separators" },
{ "&Layout","&Layout" },
{ "Show &empty fields","Zeige leere Felder" },
{ "Show field &labels","Zeige Feld Label" },
{ "Be&havior","Ver&halten" },
{ "Header, Border and Separator Color","Kopf, Rand und Trennlinien Farbe" },
{ "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>","<qt>Sind Sie sicher, dass Sie die Ansicht <b>%1</b> löschen möchten?</qt>" },
{ "Confirm Delete","Bestätige Löschen" },
{ "Edit Address Book Filter","Editiere Adressbuch Filter" },
{ "Category rule","Kategorie Regel" },
{ "Include categories","Schließe Kategorien ein" },
{ "Exclude categories","Schließe Kategorien aus" },
{ "Include contacts, that are:","Schließe folgende Kontakte ein:" },
{ "public","Öffentlich" },
{ "private","Privat" },
{ "confidential","Vertraulich" },
{ "Configure Resources","Konfiguriere Resourcen" },
{ "Resource Configuration","Resource Konfiguration" },
{ "Resources","Resourcen" },
{ "Standard","Standard" },
{ "&Use as Standard","Setze als Standard" },
{ "Select type of the new resource:","Selektiere Typ der neuen Resource:" },
{ "General Settings","Allgemeine Einstellungen" },
{ "Read-only","Nur-Lesen" },
{ "Include in sync","Schließe in Sync mit ein" },
{ "%1 Resource Settings","%1 Resource Einstellungen" },
{ "Format:","Format:" },
{ "Location:","Ort:" },
{ "Full Menu bar (restart)","Volle Menu Leiste (Neustart!)" },
{ "Language","Sprache" },
{ "Time Format","Zeit Format" },
{ "Time Zone","Zeit Zone" },
{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
{ "Save settings","Speichere Einstellungen" },
{ "Save standard","Speichere Standard" },
{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
{ "Data storage path","Daten Speicherpfad" },
{ "Multiple Sync options","Multi Sync Optionen" },
{ "Sync algo options","Sync Ablauf Optionen" },
{ "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
{ "Incoming calendar filter:","Eingehender Kalender Filter:" },
{ "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
{ "Write back options","Optionen zum Zurückschreiben" },
{ "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
{ "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
{ "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
{ "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
{ "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
{ "Time period","Zeitspanne" },
{ "From ","Von " },
{ " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
{ " weeks in the future "," Wochen in der Zukunft " },
{ "Profile kind specific settings","Profil Art abhängige Einstellungen" },
{ "Local temp file:","Lokale temp Datei:" },
{ "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
{ "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
-{ "","" },
-{ "","" },
+{ "You cannot remove your standard resource!\n Please select a new standard resource first.","Standard Resource kann\nnicht entfernt werden!\nBitte eine andere Resource\nals Standard setzen." },
+{ "Sorry","Tut mir leid" },
+{ "You cannot use a read-only<br> resource as standard!","Man kann nicht eine read-only<br> Resource als Standard setzen!" },
+{ "Please restart to get the \nchanged resources (re)loaded!\n","Bitte starten Sie jetzt\ndas Programm neu, um die geänderten\nResourcen neu zu laden!\n" },
+{ "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n","Die gewählte Datei enthält\n keine gültige vCard.\nBitte prüfen Sie die Datei\nund versuchen es erneut.\n" },
+{ "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
\ No newline at end of file diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index acf6419..c56be8b 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -1,256 +1,255 @@ /* - This file is part of KAddressbook. - Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + This file is part of KAddressbook. + Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + As a special exception, permission is given to link this program + with any edition of Qt, and distribute the resulting executable, + without including the source code for Qt in the source distribution. */ /* -Enhanced Version of the file for platform independent KDE tools. -Copyright (c) 2004 Ulf Schenk + Enhanced Version of the file for platform independent KDE tools. + Copyright (c) 2004 Ulf Schenk -$Id$ + $Id$ */ #include <qfile.h> #include <qtextstream.h> +#include <qfileinfo.h> #include <kabc/vcardconverter.h> #include <kabc/vcardparser/vcardtool.h> #include <kfiledialog.h> #ifndef KAB_EMBEDDED #include <kio/netaccess.h> #endif //KAB_EMBEDDED #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> #include <kurl.h> #include "xxportmanager.h" #include "vcard_xxport.h" #ifndef KAB_EMBEDDED class VCardXXPortFactory : public XXPortFactory { - public: +public: XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name ) { - return new VCardXXPort( ab, parent, name ); + return new VCardXXPort( ab, parent, name ); } }; #endif //KAB_EMBEDDED extern "C" { #ifndef KAB_EMBEDDED - void *init_libkaddrbk_vcard_xxport() + void *init_libkaddrbk_vcard_xxport() #else //KAB_EMBEDDED - void *init_microkaddrbk_vcard_xxport() + void *init_microkaddrbk_vcard_xxport() #endif //KAB_EMBEDDED - { - return ( new VCardXXPortFactory() ); - } + { + return ( new VCardXXPortFactory() ); + } } VCardXXPort::VCardXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name ) - : XXPortObject( ab, parent, name ) + : XXPortObject( ab, parent, name ) { - createImportAction( i18n( "Import vCard..." ) ); -//US KABC::VCardConverter does not support the export of 2.1 addressbooks. -//US createExportAction( i18n( "Export vCard 2.1..." ), "v21" ); - createExportAction( i18n( "Export vCard 3.0..." ), "v30" ); + createImportAction( i18n( "Import vCard..." ) ); + //US KABC::VCardConverter does not support the export of 2.1 addressbooks. + //US createExportAction( i18n( "Export vCard 2.1..." ), "v21" ); + createExportAction( i18n( "Export vCard 3.0..." ), "v30" ); } bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data ) { - QString name; + QString name; - if ( list.count() == 1 ) - name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf"; - else - name = "addressbook.vcf"; + if ( list.count() == 1 ) + name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf"; + else + name = "addressbook.vcf"; #ifndef KAB_EMBEDDED - QString fileName = KFileDialog::getSaveFileName( name ); + QString fileName = KFileDialog::getSaveFileName( name ); #else //KAB_EMBEDDED - QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); + QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); #endif //KAB_EMBEDDED - if ( fileName.isEmpty() ) - return false; + if ( fileName.isEmpty() ) + return false; - QFile outFile( fileName ); - if ( !outFile.open( IO_WriteOnly ) ) { - QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); - KMessageBox::error( parentWidget(), text.arg( fileName ) ); - return false; - } + QFile outFile( fileName ); + if ( !outFile.open( IO_WriteOnly ) ) { + QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); + KMessageBox::error( parentWidget(), text.arg( fileName ) ); + return false; + } - QTextStream t( &outFile ); - t.setEncoding( QTextStream::UnicodeUTF8 ); + QTextStream t( &outFile ); + t.setEncoding( QTextStream::UnicodeUTF8 ); - KABC::Addressee::List::ConstIterator it; - for ( it = list.begin(); it != list.end(); ++it ) { - KABC::VCardConverter converter; - QString vcard; + KABC::Addressee::List::ConstIterator it; + for ( it = list.begin(); it != list.end(); ++it ) { + KABC::VCardConverter converter; + QString vcard; - KABC::VCardConverter::Version version; - if ( data == "v21" ) - version = KABC::VCardConverter::v2_1; - else - version = KABC::VCardConverter::v3_0; + KABC::VCardConverter::Version version; + if ( data == "v21" ) + version = KABC::VCardConverter::v2_1; + else + version = KABC::VCardConverter::v3_0; - converter.addresseeToVCard( *it, vcard, version ); - t << vcard << "\r\n\r\n"; - } + converter.addresseeToVCard( *it, vcard, version ); + t << vcard << "\r\n\r\n"; + } - outFile.close(); + outFile.close(); - return true; + return true; } KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const { - QString fileName; - KABC::AddresseeList addrList; - KURL url; + QString fileName; + KABC::AddresseeList addrList; + KURL url; #ifndef KAB_EMBEDDED - if ( !XXPortManager::importData.isEmpty() ) - addrList = parseVCard( XXPortManager::importData ); - else { - if ( XXPortManager::importURL.isEmpty() ) - { - url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); - } - else - url = XXPortManager::importURL; - - if ( url.isEmpty() ) - return addrList; - - QString caption( i18n( "vCard Import Failed" ) ); - if ( KIO::NetAccess::download( url, fileName ) ) { - QFile file( fileName ); - - file.open( IO_ReadOnly ); - QByteArray rawData = file.readAll(); - file.close(); - - QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); - addrList = parseVCard( data ); - - if ( !url.isLocalFile() ) - KIO::NetAccess::removeTempFile( fileName ); + if ( !XXPortManager::importData.isEmpty() ) + addrList = parseVCard( XXPortManager::importData ); + else { + if ( XXPortManager::importURL.isEmpty() ) + { + url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); + } + else + url = XXPortManager::importURL; + if ( url.isEmpty() ) + return addrList; + QString caption( i18n( "vCard Import Failed" ) ); + if ( KIO::NetAccess::download( url, fileName ) ) { + QFile file( fileName ); + + file.open( IO_ReadOnly ); + QByteArray rawData = file.readAll(); + file.close(); + + QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); + addrList = parseVCard( data ); + + if ( !url.isLocalFile() ) + KIO::NetAccess::removeTempFile( fileName ); + + } else { + QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ); + KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); + } - } else { - QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ); - KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); } - } - #else //KAB_EMBEDDED - if ( !XXPortManager::importData.isEmpty() ) - addrList = parseVCard( XXPortManager::importData ); - else { - if ( XXPortManager::importURL.isEmpty() ) - { - fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); - if ( fileName.isEmpty() ) - return addrList; - - } - else - { -//US url = XXPortManager::importURL; - qDebug("VCardXXPort::importContacts Urls at the moment not supported"); - if ( url.isEmpty() ) - return addrList; + if ( !XXPortManager::importData.isEmpty() ) + addrList = parseVCard( XXPortManager::importData ); + else { + if ( XXPortManager::importURL.isEmpty() ) + { + 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 ) ) { + QByteArray rawData = file.readAll(); + file.close(); + QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); + addrList = parseVCard( data ); + } } - - - QFile file( fileName ); - - file.open( IO_ReadOnly ); - QByteArray rawData = file.readAll(); - file.close(); - - QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); - addrList = parseVCard( data ); - - } #endif //KAB_EMBEDDED - return addrList; + 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 ); + 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; + for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { + KABC::Addressee addr; + bool ok = false; - if ( dataList[ i ].contains( "VERSION:3.0" ) ) + 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" ) ) + else if ( dataList[ i ].contains( "VERSION:2.1" ) ) ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 ); - else { + else { KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) ); continue; - } + } - if ( !addr.isEmpty() && ok ) + if ( !addr.isEmpty() && ok ) addrList.append( addr ); - else { + else { QString text = i18n( "The selected file does not include a valid vCard. " - "Please check the file and try again." ); + "Please check the file and try again." ); KMessageBox::sorry( parentWidget(), text ); + } + } + */ + if ( addrList.isEmpty() ) { + QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" ); + KMessageBox::sorry( parentWidget(), text ); } - } - */ - if ( addrList.isEmpty() ) { - QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" ); - KMessageBox::sorry( parentWidget(), text ); - } - return addrList; + return addrList; } #ifndef KAB_EMBEDDED #include "vcard_xxport.moc" #endif //KAB_EMBEDDED diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index 7f31ab1..aec74fa 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp @@ -1,107 +1,107 @@ #include <qregexp.h> #include <qapplication.h> #include "kdebug.h" #include "kcalendarsystemgregorian.h" #include "klocale.h" #include <qstringlist.h> -//#define COLLECT_TRANSLATION +#define COLLECT_TRANSLATION QDict<QString> *mLocaleDict = 0; void setLocaleDict( QDict<QString> * dict ) { mLocaleDict = dict; } #ifdef COLLECT_TRANSLATION QStringList missingTrans; QStringList existingTrans1; QStringList existingTrans2; void addMissing(const char *text) { QString mis ( text ); if ( !missingTrans.contains( mis ) ) missingTrans.append(mis); } void addExist(const char *text,QString trans ) { //return; QString mis ( text ); if ( !existingTrans1.contains( mis ) ) { existingTrans1.append(mis); existingTrans2.append(trans); } } #include <qfile.h> #include <qtextstream.h> #include <qtextcodec.h> #endif void dumpMissing() { #ifdef COLLECT_TRANSLATION QString fileName = "/tmp/usernewtrans.txt"; QFile file( fileName ); if (!file.open( IO_WriteOnly ) ) { return ; } QTextStream ts( &file ); ts.setCodec( QTextCodec::codecForName("utf8") ); int i; for ( i = 0; i< missingTrans.count(); ++i ) { QString text = missingTrans[i].replace( QRegExp("\n"),"\\n" ); ts << "{ \""<<text<< "\",\""<< text <<"\" },\n"; } file.close(); { QString fileName = "/tmp/usertrans.txt"; QFile file( fileName ); if (!file.open( IO_WriteOnly ) ) { return ; } QTextStream ts( &file ); ts.setCodec( QTextCodec::codecForName("utf8") ); int i; for ( i = 0; i< existingTrans1.count(); ++i ) { QString text = existingTrans1[i].replace( QRegExp("\n"),"\\n" ); QString text2 = existingTrans2[i].replace( QRegExp("\n"),"\\n" ); ts << "{ \""<<text<< "\",\""<< text2 <<"\" },\n"; } file.close(); } #endif } QString i18n(const char *text) { if ( ! mLocaleDict ) { #ifdef COLLECT_TRANSLATION addMissing( text ); #endif return QString( text ); } else { QString* ret = mLocaleDict->find(QString(text)) ; if ( ret == 0 ) { #ifdef COLLECT_TRANSLATION addMissing( text ); #endif return QString( text ); } else { |