-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 | |||
@@ -680,31 +680,35 @@ | |||
680 | { "Save settings","Speichere Einstellungen" }, | 680 | { "Save settings","Speichere Einstellungen" }, |
681 | { "Save standard","Speichere Standard" }, | 681 | { "Save standard","Speichere Standard" }, |
682 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 682 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
683 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 683 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, |
684 | { "Data storage path","Daten Speicherpfad" }, | 684 | { "Data storage path","Daten Speicherpfad" }, |
685 | { "Multiple Sync options","Multi Sync Optionen" }, | 685 | { "Multiple Sync options","Multi Sync Optionen" }, |
686 | { "Sync algo options","Sync Ablauf Optionen" }, | 686 | { "Sync algo options","Sync Ablauf Optionen" }, |
687 | { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" }, | 687 | { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" }, |
688 | { "Incoming calendar filter:","Eingehender Kalender Filter:" }, | 688 | { "Incoming calendar filter:","Eingehender Kalender Filter:" }, |
689 | { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" }, | 689 | { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" }, |
690 | { "Write back options","Optionen zum Zurückschreiben" }, | 690 | { "Write back options","Optionen zum Zurückschreiben" }, |
691 | { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" }, | 691 | { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" }, |
692 | { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" }, | 692 | { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" }, |
693 | { "Outgoing calendar filter:","Ausgehender Kalender Filter:" }, | 693 | { "Outgoing calendar filter:","Ausgehender Kalender Filter:" }, |
694 | { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" }, | 694 | { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" }, |
695 | { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" }, | 695 | { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" }, |
696 | { "Time period","Zeitspanne" }, | 696 | { "Time period","Zeitspanne" }, |
697 | { "From ","Von " }, | 697 | { "From ","Von " }, |
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 | |||
@@ -680,31 +680,35 @@ | |||
680 | { "Save settings","Speichere Einstellungen" }, | 680 | { "Save settings","Speichere Einstellungen" }, |
681 | { "Save standard","Speichere Standard" }, | 681 | { "Save standard","Speichere Standard" }, |
682 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 682 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
683 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 683 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, |
684 | { "Data storage path","Daten Speicherpfad" }, | 684 | { "Data storage path","Daten Speicherpfad" }, |
685 | { "Multiple Sync options","Multi Sync Optionen" }, | 685 | { "Multiple Sync options","Multi Sync Optionen" }, |
686 | { "Sync algo options","Sync Ablauf Optionen" }, | 686 | { "Sync algo options","Sync Ablauf Optionen" }, |
687 | { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" }, | 687 | { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" }, |
688 | { "Incoming calendar filter:","Eingehender Kalender Filter:" }, | 688 | { "Incoming calendar filter:","Eingehender Kalender Filter:" }, |
689 | { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" }, | 689 | { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" }, |
690 | { "Write back options","Optionen zum Zurückschreiben" }, | 690 | { "Write back options","Optionen zum Zurückschreiben" }, |
691 | { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" }, | 691 | { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" }, |
692 | { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" }, | 692 | { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" }, |
693 | { "Outgoing calendar filter:","Ausgehender Kalender Filter:" }, | 693 | { "Outgoing calendar filter:","Ausgehender Kalender Filter:" }, |
694 | { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" }, | 694 | { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" }, |
695 | { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" }, | 695 | { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" }, |
696 | { "Time period","Zeitspanne" }, | 696 | { "Time period","Zeitspanne" }, |
697 | { "From ","Von " }, | 697 | { "From ","Von " }, |
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 | |||
@@ -9,48 +9,49 @@ | |||
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | 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> |
39 | #endif //KAB_EMBEDDED | 40 | #endif //KAB_EMBEDDED |
40 | 41 | ||
41 | #include <klocale.h> | 42 | #include <klocale.h> |
42 | #include <kmessagebox.h> | 43 | #include <kmessagebox.h> |
43 | #include <ktempfile.h> | 44 | #include <ktempfile.h> |
44 | #include <kurl.h> | 45 | #include <kurl.h> |
45 | 46 | ||
46 | #include "xxportmanager.h" | 47 | #include "xxportmanager.h" |
47 | 48 | ||
48 | #include "vcard_xxport.h" | 49 | #include "vcard_xxport.h" |
49 | 50 | ||
50 | #ifndef KAB_EMBEDDED | 51 | #ifndef KAB_EMBEDDED |
51 | 52 | ||
52 | class VCardXXPortFactory : public XXPortFactory | 53 | class VCardXXPortFactory : public XXPortFactory |
53 | { | 54 | { |
54 | public: | 55 | public: |
55 | XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name ) | 56 | XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name ) |
56 | { | 57 | { |
@@ -125,105 +126,103 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
125 | t << vcard << "\r\n\r\n"; | 126 | t << vcard << "\r\n\r\n"; |
126 | } | 127 | } |
127 | 128 | ||
128 | outFile.close(); | 129 | outFile.close(); |
129 | 130 | ||
130 | return true; | 131 | return true; |
131 | } | 132 | } |
132 | 133 | ||
133 | KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | 134 | KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const |
134 | { | 135 | { |
135 | QString fileName; | 136 | QString fileName; |
136 | KABC::AddresseeList addrList; | 137 | KABC::AddresseeList addrList; |
137 | KURL url; | 138 | KURL url; |
138 | 139 | ||
139 | #ifndef KAB_EMBEDDED | 140 | #ifndef KAB_EMBEDDED |
140 | if ( !XXPortManager::importData.isEmpty() ) | 141 | if ( !XXPortManager::importData.isEmpty() ) |
141 | addrList = parseVCard( XXPortManager::importData ); | 142 | addrList = parseVCard( XXPortManager::importData ); |
142 | else { | 143 | else { |
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(); |
159 | file.close(); | 158 | file.close(); |
160 | 159 | ||
161 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | 160 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); |
162 | addrList = parseVCard( data ); | 161 | addrList = parseVCard( data ); |
163 | 162 | ||
164 | if ( !url.isLocalFile() ) | 163 | if ( !url.isLocalFile() ) |
165 | KIO::NetAccess::removeTempFile( fileName ); | 164 | KIO::NetAccess::removeTempFile( fileName ); |
166 | 165 | ||
167 | } else { | 166 | } else { |
168 | QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ); | 167 | QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ); |
169 | KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); | 168 | KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); |
170 | } | 169 | } |
171 | 170 | ||
172 | } | 171 | } |
173 | 172 | ||
174 | 173 | ||
175 | #else //KAB_EMBEDDED | 174 | #else //KAB_EMBEDDED |
176 | 175 | ||
177 | 176 | ||
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 | } |
212 | 211 | ||
213 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const | 212 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const |
214 | { | 213 | { |
215 | 214 | ||
216 | KABC::VCardTool tool; | 215 | KABC::VCardTool tool; |
217 | KABC::AddresseeList addrList; | 216 | KABC::AddresseeList addrList; |
218 | addrList = tool.parseVCards( data ); | 217 | addrList = tool.parseVCards( data ); |
219 | // LR : I switched to the code, which is in current cvs HEAD | 218 | // LR : I switched to the code, which is in current cvs HEAD |
220 | /* | 219 | /* |
221 | uint numVCards = data.contains( "BEGIN:VCARD", false ); | 220 | uint numVCards = data.contains( "BEGIN:VCARD", false ); |
222 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); | 221 | QStringList dataList = QStringList::split( "\r\n\r\n", data ); |
223 | 222 | ||
224 | for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { | 223 | for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) { |
225 | KABC::Addressee addr; | 224 | KABC::Addressee addr; |
226 | bool ok = false; | 225 | bool ok = false; |
227 | 226 | ||
228 | if ( dataList[ i ].contains( "VERSION:3.0" ) ) | 227 | if ( dataList[ i ].contains( "VERSION:3.0" ) ) |
229 | ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 ); | 228 | ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 ); |
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,35 +1,35 @@ | |||
1 | #include <qregexp.h> | 1 | #include <qregexp.h> |
2 | #include <qapplication.h> | 2 | #include <qapplication.h> |
3 | 3 | ||
4 | #include "kdebug.h" | 4 | #include "kdebug.h" |
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; |
18 | 18 | ||
19 | } | 19 | } |
20 | 20 | ||
21 | #ifdef COLLECT_TRANSLATION | 21 | #ifdef COLLECT_TRANSLATION |
22 | 22 | ||
23 | QStringList missingTrans; | 23 | QStringList missingTrans; |
24 | QStringList existingTrans1; | 24 | QStringList existingTrans1; |
25 | QStringList existingTrans2; | 25 | QStringList existingTrans2; |
26 | 26 | ||
27 | void addMissing(const char *text) | 27 | void addMissing(const char *text) |
28 | { | 28 | { |
29 | 29 | ||
30 | QString mis ( text ); | 30 | QString mis ( text ); |
31 | if ( !missingTrans.contains( mis ) ) | 31 | if ( !missingTrans.contains( mis ) ) |
32 | missingTrans.append(mis); | 32 | missingTrans.append(mis); |
33 | 33 | ||
34 | } | 34 | } |
35 | void addExist(const char *text,QString trans ) | 35 | void addExist(const char *text,QString trans ) |