-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 | 15 | ||||
-rw-r--r-- | microkde/kdecore/klocale.cpp | 2 |
4 files changed, 20 insertions, 13 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 | |||
@@ -703,4 +703,8 @@ | |||
703 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, | 703 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, |
704 | { "","" }, | 704 | { "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." }, |
705 | { "","" }, | 705 | { "Sorry","Tut mir leid" }, |
706 | { "You cannot use a read-only<br> resource as standard!","Man kann nicht eine read-only<br> Resource als Standard setzen!" }, | ||
707 | { "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" }, | ||
708 | { "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" }, | ||
709 | { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" }, | ||
706 | { "","" }, | 710 | { "","" }, |
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 | |||
@@ -703,4 +703,8 @@ | |||
703 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, | 703 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, |
704 | { "","" }, | 704 | { "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." }, |
705 | { "","" }, | 705 | { "Sorry","Tut mir leid" }, |
706 | { "You cannot use a read-only<br> resource as standard!","Man kann nicht eine read-only<br> Resource als Standard setzen!" }, | ||
707 | { "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" }, | ||
708 | { "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" }, | ||
709 | { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" }, | ||
706 | { "","" }, | 710 | { "","" }, |
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 | |||
@@ -32,2 +32,3 @@ $Id$ | |||
32 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
33 | #include <qfileinfo.h> | ||
33 | 34 | ||
@@ -148,6 +149,4 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
148 | url = XXPortManager::importURL; | 149 | url = XXPortManager::importURL; |
149 | |||
150 | if ( url.isEmpty() ) | 150 | if ( url.isEmpty() ) |
151 | return addrList; | 151 | return addrList; |
152 | |||
153 | QString caption( i18n( "vCard Import Failed" ) ); | 152 | QString caption( i18n( "vCard Import Failed" ) ); |
@@ -183,5 +182,8 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
183 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); | 182 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); |
183 | |||
184 | if ( fileName.isEmpty() ) | 184 | if ( fileName.isEmpty() ) |
185 | return addrList; | 185 | return addrList; |
186 | 186 | QFileInfo fi ( fileName ); | |
187 | if ( !fi.isFile() ) | ||
188 | return addrList; | ||
187 | } | 189 | } |
@@ -195,12 +197,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
195 | } | 197 | } |
196 | |||
197 | |||
198 | QFile file( fileName ); | 198 | QFile file( fileName ); |
199 | 199 | if ( file.open( IO_ReadOnly ) ) { | |
200 | file.open( IO_ReadOnly ); | ||
201 | QByteArray rawData = file.readAll(); | 200 | QByteArray rawData = file.readAll(); |
202 | file.close(); | 201 | file.close(); |
203 | |||
204 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | 202 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); |
205 | addrList = parseVCard( data ); | 203 | addrList = parseVCard( data ); |
204 | } | ||
206 | 205 | ||
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 | |||
@@ -10,3 +10,3 @@ | |||
10 | 10 | ||
11 | //#define COLLECT_TRANSLATION | 11 | #define COLLECT_TRANSLATION |
12 | 12 | ||