-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 | |||
@@ -698,13 +698,17 @@ | |||
698 | { " weeks in the past to "," Wochen in der Vergangenheit bis zu " }, | 698 | { " weeks in the past to "," Wochen in der Vergangenheit bis zu " }, |
699 | { " weeks in the future "," Wochen in der Zukunft " }, | 699 | { " weeks in the future "," Wochen in der Zukunft " }, |
700 | { "Profile kind specific settings","Profil Art abhängige Einstellungen" }, | 700 | { "Profile kind specific settings","Profil Art abhängige Einstellungen" }, |
701 | { "Local temp file:","Lokale temp Datei:" }, | 701 | { "Local temp file:","Lokale temp Datei:" }, |
702 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, | 702 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, |
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 | { "","" }, |
707 | { "","" }, | 711 | { "","" }, |
708 | { "","" }, | 712 | { "","" }, |
709 | { "","" }, | 713 | { "","" }, |
710 | { "","" }, \ No newline at end of file | 714 | { "","" }, \ 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 | |||
@@ -698,13 +698,17 @@ | |||
698 | { " weeks in the past to "," Wochen in der Vergangenheit bis zu " }, | 698 | { " weeks in the past to "," Wochen in der Vergangenheit bis zu " }, |
699 | { " weeks in the future "," Wochen in der Zukunft " }, | 699 | { " weeks in the future "," Wochen in der Zukunft " }, |
700 | { "Profile kind specific settings","Profil Art abhängige Einstellungen" }, | 700 | { "Profile kind specific settings","Profil Art abhängige Einstellungen" }, |
701 | { "Local temp file:","Lokale temp Datei:" }, | 701 | { "Local temp file:","Lokale temp Datei:" }, |
702 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, | 702 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, |
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 | { "","" }, |
707 | { "","" }, | 711 | { "","" }, |
708 | { "","" }, | 712 | { "","" }, |
709 | { "","" }, | 713 | { "","" }, |
710 | { "","" }, \ No newline at end of file | 714 | { "","" }, \ 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 | |||
@@ -27,12 +27,13 @@ Copyright (c) 2004 Ulf Schenk | |||
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qfile.h> | 31 | #include <qfile.h> |
32 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
33 | #include <qfileinfo.h> | ||
33 | 34 | ||
34 | #include <kabc/vcardconverter.h> | 35 | #include <kabc/vcardconverter.h> |
35 | #include <kabc/vcardparser/vcardtool.h> | 36 | #include <kabc/vcardparser/vcardtool.h> |
36 | #include <kfiledialog.h> | 37 | #include <kfiledialog.h> |
37 | #ifndef KAB_EMBEDDED | 38 | #ifndef KAB_EMBEDDED |
38 | #include <kio/netaccess.h> | 39 | #include <kio/netaccess.h> |
@@ -143,16 +144,14 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
143 | if ( XXPortManager::importURL.isEmpty() ) | 144 | if ( XXPortManager::importURL.isEmpty() ) |
144 | { | 145 | { |
145 | url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); | 146 | url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); |
146 | } | 147 | } |
147 | else | 148 | else |
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" ) ); |
154 | if ( KIO::NetAccess::download( url, fileName ) ) { | 153 | if ( KIO::NetAccess::download( url, fileName ) ) { |
155 | QFile file( fileName ); | 154 | QFile file( fileName ); |
156 | 155 | ||
157 | file.open( IO_ReadOnly ); | 156 | file.open( IO_ReadOnly ); |
158 | QByteArray rawData = file.readAll(); | 157 | QByteArray rawData = file.readAll(); |
@@ -178,34 +177,34 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
178 | if ( !XXPortManager::importData.isEmpty() ) | 177 | if ( !XXPortManager::importData.isEmpty() ) |
179 | addrList = parseVCard( XXPortManager::importData ); | 178 | addrList = parseVCard( XXPortManager::importData ); |
180 | else { | 179 | else { |
181 | if ( XXPortManager::importURL.isEmpty() ) | 180 | if ( XXPortManager::importURL.isEmpty() ) |
182 | { | 181 | { |
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 | } |
188 | else | 190 | else |
189 | { | 191 | { |
190 | //US url = XXPortManager::importURL; | 192 | //US url = XXPortManager::importURL; |
191 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); | 193 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); |
192 | if ( url.isEmpty() ) | 194 | if ( url.isEmpty() ) |
193 | return addrList; | 195 | return addrList; |
194 | 196 | ||
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 | ||
207 | } | 206 | } |
208 | #endif //KAB_EMBEDDED | 207 | #endif //KAB_EMBEDDED |
209 | 208 | ||
210 | return addrList; | 209 | return addrList; |
211 | } | 210 | } |
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 | |||
@@ -5,13 +5,13 @@ | |||
5 | #include "kcalendarsystemgregorian.h" | 5 | #include "kcalendarsystemgregorian.h" |
6 | 6 | ||
7 | #include "klocale.h" | 7 | #include "klocale.h" |
8 | 8 | ||
9 | #include <qstringlist.h> | 9 | #include <qstringlist.h> |
10 | 10 | ||
11 | //#define COLLECT_TRANSLATION | 11 | #define COLLECT_TRANSLATION |
12 | 12 | ||
13 | 13 | ||
14 | QDict<QString> *mLocaleDict = 0; | 14 | QDict<QString> *mLocaleDict = 0; |
15 | void setLocaleDict( QDict<QString> * dict ) | 15 | void setLocaleDict( QDict<QString> * dict ) |
16 | { | 16 | { |
17 | mLocaleDict = dict; | 17 | mLocaleDict = dict; |